Commit graph

170 commits

Author SHA1 Message Date
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
f0b5ea8966 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
3b96f80dad requirements: set django==1.7.8
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:10:29 -06:00
d801b5912b local_settings: in example call settings ok.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:10:09 -06:00
5b5b47e9fd requirements: fixed Django version.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:44:22 -06:00
b0f8acbe35 settings: Replaced ROOT_PATH call with BASE_DIR.
custom.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:36:08 -06:00
0a47b1778d 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
e861773064 settings: added APP_ROOT_ENDPOINT, fixed reference
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:33:10 -06:00
7b8fe87238 urls: added django-cms urls to project urls.py
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:30:03 -06:00
d8cbc04248 settings: ckeditr ingration with django-filer.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:24:49 -06:00
c7aaba3da6 settings: added migrations & thumbnail_processors
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 23:23:45 -06:00
28120c6c22 settings: Added TEMPLATE_DIRS tuple and MEDIA_*
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:57:00 -06:00
50e1e9e28d gitignore: added media folder 2015-05-20 22:47:11 -06:00
3359c4fa18 settings: added template_processors for django cms
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:42:05 -06:00
f514198f7a settings: added django-cms middlewares.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:39:30 -06:00
7a386806f9 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
b9deacad4e settings: added apps for django-cms
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 22:06:24 -06:00
a1c97d96ce settings: added local_settings.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 20:57:22 -06:00
e280d3213c requirements: added more django-cms plugins.
Added editable package, for django-select2,
the egg django-select2-py3 in pypy wasn't
updated since 2013. Functionality hasn't
been tested but at least it installed.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 19:40:26 -06:00
fa26689808 requirements: added djangocms-blog egg.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 19:12:45 -06:00
3eb9df9097 requirements: added base eggs.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 19:06:58 -06:00
7f33ac39c0 gitignore: added more patterns.
local_settings.py, it's for enviroment
variables, secret keys...

The rest of patterns are just standard.

Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-20 18:56:54 -06:00
Nico Schottelius
c05c253b42 do not print - but ignore if localsettings are not existing
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-14 11:58:43 +02:00
Nico Schottelius
2ef2269c41 begin requirments.txt
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-14 09:47:39 +02:00
Nico Schottelius
2b9ebdf96c postgres module
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-14 01:24:40 +02:00