Levi 
								
							 
						 
						
							
							
								
							
							
	4cc18a4214  
						 
						
							
							
								
								
								started translations  
							
							
							
							
						 
						
							2017-02-20 22:25:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4389230b60  
						 
						
							
							
								
								
								:Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop  
							
							... 
							
							
							
							
							Conflicts:
	dynamicweb/settings-test/__init__.py
	requirements.txt
	templates/cms/ungleich.ch/_footer.html
	templates/cms/ungleich.ch/_header_base.html
	templates/cms/ungleich.ch/_menu.html
	templates/cms/ungleich.ch/base.html
	templates/cms/ungleich.ch/blog.html
	templates/cms/ungleich.ch/page.html
	templates/cms/ungleichch/__init__.py
	templates/cms/ungleichch/_footer.html
	templates/cms/ungleichch/_header_base.html
	templates/cms/ungleichch/_menu.html
	templates/cms/ungleichch/base.html
	templates/cms/ungleichch/blog.html
	templates/cms/ungleichch/page.html
	ungleich/templates/cms/ungleichch/_footer.html
	ungleich/templates/cms/ungleichch/_header_base.html
	ungleich/templates/cms/ungleichch/_menu.html
	ungleich/templates/cms/ungleichch/base_ungleich.html
	ungleich/templates/cms/ungleichch/blog_ungleich.html
	ungleich/templates/cms/ungleichch/page.html 
							
						 
						
							2016-04-22 10:08:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	5fd4275046  
						 
						
							
							
								
								
								updated main pages links  
							
							
							
							
						 
						
							2016-04-01 12:37:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	d29902c676  
						 
						
							
							
								
								
								removed  
							
							
							
							
						 
						
							2016-03-31 18:15:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	ddb4de2954  
						 
						
							
							
								
								
								fixed orphaned plugins and add post functionality  
							
							
							
							
						 
						
							2016-03-25 19:18:07 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	18c75cf00e  
						 
						
							
							
								
								
								removed duplicated djangocms  
							
							
							
							
						 
						
							2016-03-22 21:09:59 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	ca033be061  
						 
						
							
							
								
								
								Blog update  
							
							
							
							
						 
						
							2016-03-22 01:21:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	039399b95b  
						 
						
							
							
								
								
								server push  
							
							
							
							
						 
						
							2016-03-19 21:28:58 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	f82e0604ca  
						 
						
							
							
								
								
								update req file and update directory structure  
							
							
							
							
						 
						
							2016-03-07 19:20:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tomislav R 
								
							 
						 
						
							
							
								
							
							
	7936e5dfe5  
						 
						
							
							
								
								
								update  
							
							
							
							
						 
						
							2016-03-01 21:24:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d6ddbc31ce  
						 
						
							
							
								
								
								added supporters plugin  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2016-02-14 09:47:07 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	43bac8b075  
						 
						
							
							
								
								
								DG: added link to supporters...  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2016-02-08 04:21:33 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3b8cf21d5a  
						 
						
							
							
								
								
								deleted counter on letscowork item  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2016-02-08 03:41:47 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	333d751057  
						 
						
							
							
								
								
								adding placeholder for index gallery  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2016-02-08 03:01:34 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6006aa0c66  
						 
						
							
							
								
								
								added one column template  
							
							
							
							
						 
						
							2015-11-14 16:29:05 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2611921bf8  
						 
						
							
							
								
								
								added one column  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-11-14 15:58:17 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c502021b15  
						 
						
							
							
								
								
								blog.ungleich: only show root pages on menu  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-11-02 16:59:50 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fd3dd6ba46  
						 
						
							
							
								
								
								digitalglarus: changing lang menu content.  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 19:31:40 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	54cadfb6a4  
						 
						
							
							
								
								
								digitalglarus: fixed menu layout  
							
							
							
							
						 
						
							2015-10-04 19:05:09 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4eecb94a63  
						 
						
							
							
								
								
								digitalglarus: fixing nav menu  
							
							
							
							
						 
						
							2015-10-04 18:00:09 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ecb9467781  
						 
						
							
							
								
								
								digitalglarus: cms, fixed menu format  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 17:12:35 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	8a90caf7da  
						 
						
							
							
								
								
								digitalglarus: submenu for digitalglarus  
							
							
							
							
						 
						
							2015-10-04 16:57:50 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	50e0cb9a71  
						 
						
							
							
								
								
								digitalglarus: fixed typo on menu call  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 15:26:05 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b338ba6092  
						 
						
							
							
								
								
								digitalglarus: cms navigation.  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 15:13:13 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5b6b8d1427  
						 
						
							
							
								
								
								digital.glarus: cms templates don't have to call 'static' base.  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 10:45:06 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	450ecc069b  
						 
						
							
							
								
								
								digitalglarus: removed bad menu lang-chooser call  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 10:44:43 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f9b3cfbf48  
						 
						
							
							
								
								
								templates: cms, removed DG.Detail from django-cms  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 10:44:25 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	9d38d3aee6  
						 
						
							
							
								
								
								digitalglarus: i18n django-cms conf  
							
							
							
							
						 
						
							2015-10-04 09:38:01 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	df9b0eacaa  
						 
						
							
							
								
								
								Merge branch 'feature/digital.glarus.german' into develop  
							
							
							
							
						 
						
							2015-10-04 09:23:56 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	9f2fa42302  
						 
						
							
							
								
								
								templates: added html for digital.glarus cms.  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 08:33:48 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b12a273a1d  
						 
						
							
							
								
								
								templates: cms, moved ungleich.ch -> ungleichch  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-10-04 08:27:44 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	753c6c2af0  
						 
						
							
							
								
								
								templates: block meta  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-06-16 02:16:16 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	9c5dd3c152  
						 
						
							
							
								
								
								settings: added django-meta configuration.  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-06-16 01:37:13 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	7444c36392  
						 
						
							
							
								
								
								templates: added meta description and block meta.  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-06-16 01:05:47 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d335c2bd57  
						 
						
							
							
								
								
								templates: Added blog article title to <title>  
							
							... 
							
							
							
							
							Closes  #1628 .
Signed-off-by: rscnt <rascnt@gmail.com> 
						
							2015-06-16 00:25:21 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b214a1d6dc  
						 
						
							
							
								
								
								templates: fixed cdn files to fetch from https  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-06-13 16:49:15 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a1085cae75  
						 
						
							
							
								
								
								templates: problem with modals size.  
							
							... 
							
							
							
							
							see: https://github.com/divio/django-cms/issues/3465 
Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-06-13 13:59:37 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f5f35b859b  
						 
						
							
							
								
								
								templates: added 404 and 505.  
							
							... 
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 
						
							2015-05-30 20:29:38 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	02f27b0c93  
						 
						
							
							
								
								
								added static links to footer  
							
							
							
							
						 
						
							2015-05-26 06:47:22 -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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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