Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPSWeb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VIPS
VIPSWeb
Commits
1cfc11ce
Commit
1cfc11ce
authored
9 years ago
by
Tor-Einar Skog
Browse files
Options
Downloads
Patches
Plain Diff
Adding a bit more editing possibilities in TinyMCE fields
parent
a2583418
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
VIPSWeb/settings.py
+3
-0
3 additions, 0 deletions
VIPSWeb/settings.py
VIPSWeb/urls.py
+1
-1
1 addition, 1 deletion
VIPSWeb/urls.py
information/admin.py
+2
-0
2 additions, 0 deletions
information/admin.py
information/models.py
+1
-1
1 addition, 1 deletion
information/models.py
with
7 additions
and
2 deletions
VIPSWeb/settings.py
+
3
−
0
View file @
1cfc11ce
...
@@ -137,6 +137,9 @@ INSTALLED_APPS = (
...
@@ -137,6 +137,9 @@ INSTALLED_APPS = (
'
VIPSWeb
'
'
VIPSWeb
'
)
)
TINYMCE_DEFAULT_CONFIG
=
{
'
theme
'
:
"
advanced
"
,
'
relative_urls
'
:
False
}
TINYMCE_COMPRESSOR
=
True
SESSION_SERIALIZER
=
'
django.contrib.sessions.serializers.JSONSerializer
'
SESSION_SERIALIZER
=
'
django.contrib.sessions.serializers.JSONSerializer
'
# A sample logging configuration. The only tangible logging
# A sample logging configuration. The only tangible logging
...
...
This diff is collapsed.
Click to expand it.
VIPSWeb/urls.py
+
1
−
1
View file @
1cfc11ce
...
@@ -45,7 +45,7 @@ urlpatterns = patterns('',
...
@@ -45,7 +45,7 @@ urlpatterns = patterns('',
url
(
r
'
^organisms/
'
,
include
(
'
organisms.urls
'
,
namespace
=
"
organisms
"
)),
url
(
r
'
^organisms/
'
,
include
(
'
organisms.urls
'
,
namespace
=
"
organisms
"
)),
url
(
r
'
^information/
'
,
include
(
'
information.urls
'
,
namespace
=
"
information
"
)),
url
(
r
'
^information/
'
,
include
(
'
information.urls
'
,
namespace
=
"
information
"
)),
url
(
r
'
^blotch/
'
,
include
(
'
cerealblotchmodels.urls
'
,
namespace
=
"
cerealblotchmodels
"
)),
url
(
r
'
^blotch/
'
,
include
(
'
cerealblotchmodels.urls
'
,
namespace
=
"
cerealblotchmodels
"
)),
url
(
r
'
^calculators/
'
,
include
(
'
calculators.urls
'
,
namespace
=
"
calcu
a
ltors
"
)),
url
(
r
'
^calculators/
'
,
include
(
'
calculators.urls
'
,
namespace
=
"
calcul
a
tors
"
)),
# Uncomment the next line to enable the admin:
# Uncomment the next line to enable the admin:
url
(
r
'
^admin/
'
,
include
(
admin
.
site
.
urls
)),
url
(
r
'
^admin/
'
,
include
(
admin
.
site
.
urls
)),
...
...
This diff is collapsed.
Click to expand it.
information/admin.py
+
2
−
0
View file @
1cfc11ce
...
@@ -18,10 +18,12 @@
...
@@ -18,10 +18,12 @@
from
django.contrib
import
admin
from
django.contrib
import
admin
from
information.models
import
Information
,
InformationLocale
from
information.models
import
Information
,
InformationLocale
# Register your models here.
# Register your models here.
class
InformationLocaleInline
(
admin
.
TabularInline
):
class
InformationLocaleInline
(
admin
.
TabularInline
):
model
=
InformationLocale
model
=
InformationLocale
fields
=
[
'
language_code
'
,
'
headline
'
,
'
lead_paragraph
'
,
'
body
'
]
fields
=
[
'
language_code
'
,
'
headline
'
,
'
lead_paragraph
'
,
'
body
'
]
"""
"""
# This actually works, but CSS overrides the size attribute...
# This actually works, but CSS overrides the size attribute...
def formfield_for_dbfield(self, db_field, **kwargs):
def formfield_for_dbfield(self, db_field, **kwargs):
...
...
This diff is collapsed.
Click to expand it.
information/models.py
+
1
−
1
View file @
1cfc11ce
from
django.db
import
models
from
django.db
import
models
from
tinymce
import
models
as
tinymce_models
from
django.conf
import
settings
from
django.conf
import
settings
from
django.utils
import
translation
from
django.utils
import
translation
from
tinymce
import
models
as
tinymce_models
# Create your models here.
# Create your models here.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment