Commit graph

144 commits

Author SHA1 Message Date
6a2e819155 Merge branch 'feature/integrate-railshosting' into develop 2015-05-30 15:31:57 -06:00
68ce62d503 migrations: merge brings the same migration.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 15:31:07 -06:00
5829c9fa4a 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
9d521f3384 configs: added include proxy conf example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:30:28 -06:00
0734110804 configs: replaced gevent with meinheld.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:30:14 -06:00
f087832151 configs: debian packages added
- added circus nginx conf fix.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:10:21 -06:00
755f70a1ef config: nginx example, prefered a complete config
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:09:19 -06:00
d80b3835ca config: circus fixed nginx example.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 02:09:05 -06:00
1d70f97347 conf: added example conf for nginx proxy
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:40:07 -06:00
9be99ab8ee conf: added circus .init for nginx
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:48 -06:00
62c0f014ab config: added circus .ini for webapp
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:28 -06:00
6b5d43a553 requirements: added gevent.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-28 00:39:14 -06:00
9a27aafd99 deleted foo.txt 2015-05-27 23:28:12 -06:00
c4bfe5f4bd requirements: added circus + chaussette.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:52 -06:00
00d3796e6d txt: added list of debian packages
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:40 -06:00
36a9e0483d settings: added memcached config.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-27 23:22:20 -06:00
Nico Schottelius
4027ecb8b1 fix bottom script error
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 21:48:41 +02:00
Nico Schottelius
b155fb2c81 +migration
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 21:31:35 +02:00
Nico Schottelius
9eab2c58cf add google tracking
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 17:39:59 +02:00
Nico Schottelius
921ba59db3 unicorn instead of uwsgi
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 15:56:51 +02:00
Nico Schottelius
023dad86df get railshosting running
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 15:41:43 +02:00
Nico Schottelius
f09ee6cd79 import railshosting from static
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 12:21:30 +02:00
f2e1347403 Merge branch 'hotfix/html-links' into develop 2015-05-26 06:47:44 -06:00
48036329d9 Merge branch 'hotfix/html-links' 2015-05-26 06:47:33 -06:00
02f27b0c93 added static links to footer 2015-05-26 06:47:22 -06:00
0ee5eaba90 Merge branch 'release/version-1.1' 2015-05-26 06:36:24 -06:00
97c1e0222e Merge branch 'feature/django-cms-setup' into develop 2015-05-26 06:34:09 -06:00
a67c024943 test 2015-05-26 06:33:48 -06:00
d9883cc503 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
02b52b1cf1 requirements: packages updated 2015-05-24 10:26:22 -06:00
781adaec27 requirements: added stable requirements 2015-05-24 07:29:20 -06:00
463fc370b4 models: ungleich, added app_label to UngleichPage
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 04:17:04 -06:00
2ca57ed4d1 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
81e108a011 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
6caea3c709 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
78919b9079 static: added .text-center class to css/clean-blog
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 04:02:22 -06:00
a847a4bf87 added static cache folder to gitignore 2015-05-23 01:18:26 -06:00
76bfb3c47b 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
6c312a6e2e static: added clean-blog.css
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-22 01:32:18 -06:00
37ebf40620 settings: added django_compressor
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-22 01:31:44 -06:00
e0675ee071 requirements: Added django-bootstrap3
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-22 00:02:05 -06:00
75acdaf3a5 migration: added digital_glarus migration.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 22:52:56 -06:00
2f412b8457 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
fd5e6517dd settings: fixed typo.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 22:43:18 -06:00
180c8683b8 settings: added template dirs.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 02:17:05 -06:00
d34ab5fa3a settings: moved 'djangocms_admin_style' on INSTALLED_APP 2015-05-21 01:44:31 -06:00
0af909af0e urls: added taggit_autosuggest.url, djangocms-blog
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:29:42 -06:00
f0bcad7497 settings: how, did I? confuse template with core?
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:24:56 -06:00
40ca3f37a0 urls: imports, forgot, dumb.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:21:22 -06:00
1107b41db0 settings: added locale middleware
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:21:08 -06:00