Commit graph

78 commits

Author SHA1 Message Date
5d9c306573 Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting
Conflicts:
dynamicweb/settings.py
    Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
   Added railshosting url.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 15:29:33 -06:00
Nico Schottelius
c9c5935bff fix bottom script error
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 21:48:41 +02:00
Nico Schottelius
b3e7698aea +migration
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 21:31:35 +02:00
Nico Schottelius
022332bf6f add google tracking
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 17:39:59 +02:00
Nico Schottelius
4417524218 unicorn instead of uwsgi
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 15:56:51 +02:00
Nico Schottelius
6aaa04eaa2 get railshosting running
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 15:41:43 +02:00
Nico Schottelius
96f31ed380 import railshosting from static
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 12:21:30 +02:00
f1c365116a Merge branch 'hotfix/html-links' into develop 2015-05-26 06:47:44 -06:00
c292734c11 added static links to footer 2015-05-26 06:47:22 -06:00
0c060fa519 Merge branch 'release/version-1.1' 2015-05-26 06:36:24 -06:00
ca21514136 Merge branch 'feature/django-cms-setup' into develop 2015-05-26 06:34:09 -06:00
0132b066c8 test 2015-05-26 06:33:48 -06:00
3395220e65 models: UngleichPage, -image_header +image
The filed image_header was removed, and
a new filed image was added, the reason
for this change is that image being a
FilerImageFiled can make use of previously
uploaded images while with image_header only
uploads where available.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-24 10:59:26 -06:00
37e527bd28 requirements: packages updated 2015-05-24 10:26:22 -06:00
c6dad28cda requirements: added stable requirements 2015-05-24 07:29:20 -06:00
c3fe70709c models: ungleich, added app_label to UngleichPage
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 04:17:04 -06:00
280e30ad15 tempaltes: Added blog templates.
An override of the djangocms_blog templates.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 04:16:38 -06:00
d57a8dc338 tempaltes: Added usable tempaltes.
+ cms/ungleich.ch/blog.html:
   This template should only be used
   to page with the Blog application set.
   Although it doesn't declare anything special
   than exposing the content block.

+ cms/ungleich.ch/index.html: Not used. Example?

+ cms/ungleich.ch/page.html:
    A template for generic pages, it only declares
    a placeholder inside the base_content where
    you should but the content for the page.

+ cms/ungleich.ch/__init__.py
    See documentation for django cms regarding
    template_dirs settings option.
    Used for namespacing and order.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 04:12:51 -06:00
8f6461fd63 templates: added cms/ungleich.ch/base.html
This template holds the base structure for
every page in the site.

It expose the following blocks:

+ base_header:
    This block is used to display the big banner
    and title image for the main style of the site.
    When overriding this block always prefere the use
    of include, since the amount of markup needed for
    the header is quite a lot.
    For an example of what should be in this block
    look at: cms/ungleich.ch/_header_base.html.

+ block_content:
    Holds the main content for the page, it delcares a
    placeholder "default".

This commit also includes the following templates:

cms/ungleich.ch/_footer.html:
    Markup for the footer of the page.
    TODO: Social links.

cms/ungleich.ch/_header_base.html:
    Markup for the big image with the title and
    summary of the page.

cms/ungleich.ch/_menu.html:
    Markup for the main navigation markup for the
    entire site.

And the required static files.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 04:09:39 -06:00
261160f46f static: added .text-center class to css/clean-blog
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 04:02:22 -06:00
e3d4eac9c8 added static cache folder to gitignore 2015-05-23 01:18:26 -06:00
bad0870035 Added ungleich app to extend Page models.
Ungleich app has a model called UngleichPage,
this model has an attribute called image_header
which will be used to set the background image for
the page header.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 00:33:35 -06:00
1299a8cefc static: added clean-blog.css
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-22 01:32:18 -06:00
d6fdaea4ed settings: added django_compressor
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-22 01:31:44 -06:00
0a9955986e requirements: Added django-bootstrap3
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-22 00:02:05 -06:00
1c97a01f73 migration: added digital_glarus migration.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 22:52:56 -06:00
9e995c66d4 settings: changed CMS_TEMPLATE_DIR value.
- For the SITE_ID=1, templates will be looked
  on the first entry for TEMPLATE_DIRS option.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 22:51:23 -06:00
dec8dd7aad settings: fixed typo.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 22:43:18 -06:00
3bca8a22df settings: added template dirs.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 02:17:05 -06:00
36f0ec962e settings: moved 'djangocms_admin_style' on INSTALLED_APP 2015-05-21 01:44:31 -06:00
7aa821fdfd urls: added taggit_autosuggest.url, djangocms-blog
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:29:42 -06:00
46332a208c settings: how, did I? confuse template with core?
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:24:56 -06:00
5ef77152c1 urls: imports, forgot, dumb.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:21:22 -06:00
063d278304 settings: added locale middleware
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:21:08 -06:00
3ba99ee417 settings: fixed migrations calls.
The migrations for the new version of
django-cms were in cms/migrations/* not
cms/migrations_django/* .

- Fixed: local_settings import.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:10:54 -06:00
fbf9603cd4 requirements: set django==1.7.8
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:10:29 -06:00
e7b8fcc9b8 local_settings: in example call settings ok.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:10:09 -06:00
c7c21fb632 requirements: fixed Django version.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:44:22 -06:00
7cdd9d2859 settings: Replaced ROOT_PATH call with BASE_DIR.
custom.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:36:08 -06:00
e939806380 settings: fixed references on vars.
None != nil, too much ruby.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:34:24 -06:00
fe8e6d13d1 settings: added APP_ROOT_ENDPOINT, fixed reference
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:33:10 -06:00
7a713041aa urls: added django-cms urls to project urls.py
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:30:03 -06:00
1c95a518d9 settings: ckeditr ingration with django-filer.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:24:49 -06:00
440e449229 settings: added migrations & thumbnail_processors
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:23:45 -06:00
e97f2b8d3b settings: Added TEMPLATE_DIRS tuple and MEDIA_*
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:57:00 -06:00
5a2c77de2e gitignore: added media folder 2015-05-20 22:47:11 -06:00
38a5e1e7ec settings: added template_processors for django cms
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:42:05 -06:00
e98abedf2e settings: added django-cms middlewares.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:39:30 -06:00
d2e978caeb settings: adapting settings for django1.7
- Fixed: call to local.local_settings module.
- Added: TEMPLATE_CONTEXT_PROCESSORS tuple,
     django 1.7 requirement.
- Added: SITE_ID variable.
- Added: 'django.contrib.sites' to INSTALLED_APPS
     tuple for django 1.7 compatibility.
- Fixed: Languages code settings.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:38:22 -06:00
4563872d75 settings: added apps for django-cms
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:06:24 -06:00