ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity
100 commits 13 branches 148 tags 315 MiB
Commit graph

100 commits

This branch
This branch
All branches
Author SHA1 Message Date
rscnt
de74539fa6 settings: options for text editor and let host use x forwarded 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 05:32:11 -06:00
rscnt
9fe61554a7 settings: fixed typo on media. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-31 04:52:53 -06:00
rscnt
411588d6d3 Merge branch 'develop' of git.ungleich.ch:dynamicweb into feature/production-1.1 2015-05-30 23:22:31 -06:00
rscnt
d10e7fc0b5 requirements: added gevent and circus git. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 23:18:11 -06:00
rscnt
ad48104d3a configs: ungleich circus. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 23:17:58 -06:00
rscnt
5ef00d1bb9 config: added admin 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 20:29:49 -06:00
rscnt
182335fd10 templates: added 404 and 505. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 20:29:38 -06:00
rscnt
e4aa678152 Merge branch 'feature/integrate-railshosting' into develop 2015-05-30 15:31:57 -06:00
rscnt
a52cd6d44d migrations: merge brings the same migration. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-30 15:31:07 -06:00
rscnt
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
rscnt
088a271d54 configs: added include proxy conf example. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:30:28 -06:00
rscnt
0e9d71512e configs: replaced gevent with meinheld. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:30:14 -06:00
rscnt
b9f7564048 configs: debian packages added 
- added circus nginx conf fix.

Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:10:21 -06:00
rscnt
1620a60905 config: nginx example, prefered a complete config 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:09:19 -06:00
rscnt
b7be16f5ad config: circus fixed nginx example. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 02:09:05 -06:00
rscnt
b43ce77ad4 conf: added example conf for nginx proxy 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 00:40:07 -06:00
rscnt
664fb735d9 conf: added circus .init for nginx 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 00:39:48 -06:00
rscnt
a630d3be45 config: added circus .ini for webapp 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 00:39:28 -06:00
rscnt
62bbd14dc4 requirements: added gevent. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-28 00:39:14 -06:00
rscnt
3044234a1d deleted foo.txt 2015-05-27 23:28:12 -06:00
rscnt
4971c3cb7d requirements: added circus + chaussette. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-27 23:22:52 -06:00
rscnt
cc0988135e txt: added list of debian packages 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-27 23:22:40 -06:00
rscnt
ff742091c5 settings: added memcached config. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-27 23:22:20 -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
rscnt
f1c365116a Merge branch 'hotfix/html-links' into develop 2015-05-26 06:47:44 -06:00
rscnt
c292734c11 added static links to footer 2015-05-26 06:47:22 -06:00
rscnt
0c060fa519 Merge branch 'release/version-1.1' 2015-05-26 06:36:24 -06:00
rscnt
ca21514136 Merge branch 'feature/django-cms-setup' into develop 2015-05-26 06:34:09 -06:00
rscnt
0132b066c8 test 2015-05-26 06:33:48 -06:00
rscnt
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
rscnt
37e527bd28 requirements: packages updated 2015-05-24 10:26:22 -06:00
rscnt
c6dad28cda requirements: added stable requirements 2015-05-24 07:29:20 -06:00
rscnt
c3fe70709c models: ungleich, added app_label to UngleichPage 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-23 04:17:04 -06:00
rscnt
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
rscnt
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
rscnt
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
rscnt
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
rscnt
e3d4eac9c8 added static cache folder to gitignore 2015-05-23 01:18:26 -06:00
rscnt
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
rscnt
1299a8cefc static: added clean-blog.css 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-22 01:32:18 -06:00
rscnt
d6fdaea4ed settings: added django_compressor 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-22 01:31:44 -06:00
rscnt
0a9955986e requirements: Added django-bootstrap3 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-22 00:02:05 -06:00
rscnt
1c97a01f73 migration: added digital_glarus migration. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 22:52:56 -06:00
rscnt
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
rscnt
dec8dd7aad settings: fixed typo. 
Signed-off-by: rscnt <rascnt@gmail.com>
 2015-05-21 22:43:18 -06:00