Version 1.4.6: Change content, CSRF-notification, fix blox editor, alert for raw editor, cyanine optimizations

themes/cyanine/css/style.css

@@ -124,8 +124,10 @@ article a:hover, article a:focus, article a:active,
 footer a:hover, footer a:focus, footer a:active{ 
 	text-decoration: none;
 }
-/* Fix background for hightlight plugin */
+
+/* Fix background for hightlight plugin 
 code.hljs{ background: transparent; }
+*/
 
 /* For definition list */
 dt::after{

themes/cyanine/cyanine.yaml

@@ -1,5 +1,5 @@
 name: Cyanine Theme
-version: 1.1.3
+version: 1.1.4
 description: Cyanine is a modern and flexible multi-purpose theme and the standard theme for typemill. 
 author: Trendschau
 homepage: https://trendschau.net
@@ -243,18 +243,34 @@ forms:
           label: Text/label for edit link
           placeholder: edit on github
 
-    fieldsetChapters:
+    fieldsetNavigations:
       type: fieldset
       legend: Navigations and Chapters
       fields:
-        collapseNav:
-          type: checkbox
-          label: Collapse navigation
-          checkboxlabel: Collapse and expand navigation?
         chapnum:
           type: checkbox
           label: Chapter Numbers
           checkboxlabel: Show chapter numbers in navigation?
+        collapseNav:
+          type: checkbox
+          label: Collapse navigation
+          checkboxlabel: Collapse and expand navigation?
+        expand:
+          type: text
+          label: Label for expand button
+          placeholder: expand navigation
+        collapse:
+          type: text
+          label: Label for collapse button
+          placeholder: collapse navigation
+        next:
+          type: text
+          label: Label for next link
+          placeholder: next
+        previous:
+          type: text
+          label: Label for previous link
+          placeholder: previous
 
     fieldsetfooter:
       type: fieldset

themes/cyanine/home/landingpageIntro.twig

@@ -2,7 +2,9 @@
 
 		<div class="mw7 pb7 ph3 center">
 			<header class="mt6">
-				{% if settings.themes.cyanine.introTitle %}
+				{% if logo %}
+					<img src="{{ base_url }}/{{ logo }}" class="logo-image"/>
+				{% elseif settings.themes.cyanine.introTitle %}
 					<h1 class="f-large f-headline-ns lh-title mv2 pt5-ns">{{ settings.themes.cyanine.introTitle }}</h1>
 				{% else %}
 					<h1 class="f-large f-headline-ns lh-title mv2 pt5-ns">{{ title }}</h1>

themes/cyanine/layout.twig

@@ -242,7 +242,10 @@
 			
 			{% if settings.themes.cyanine.collapseNav %}
 				<script>
-					var expandButton = document.getElementById("expander");
+					var expandButton 	= document.getElementById("expander");
+					var expandLabel		= expandButton.dataset.expandlabel;
+					var collapseLabel	= expandButton.dataset.collapselabel;
+					
 					if(expandButton)
 					{
 						expandButton.addEventListener('click', function(e)
@@ -253,11 +256,11 @@
 
 							if(contentnav.classList.contains("collapse"))
 							{
-								expandButton.innerHTML = "expand navigation";
+								expandButton.innerHTML = expandLabel;
 							}
 							else
 							{
-								expandButton.innerHTML = "collapse navigation";
+								expandButton.innerHTML = collapseLabel;
 							}
 						});
 					}

themes/cyanine/partials/breadcrumb.twig

@@ -14,10 +14,10 @@
 	</div>
 	<div class="dn dib-l">
 		{% if item.prevItem %}
-			<a class="link pr1 f-link underline-hover" href="{{ item.prevItem.urlRel }}">&lsaquo;&nbsp; {{ __('previous') }}</a>
+			<a class="link pr1 f-link underline-hover" href="{{ item.prevItem.urlRel }}">&lsaquo;&nbsp; {{ settings.themes.cyanine.previous|default('previous') }}</a>
 		{% endif %}
 		{% if item.nextItem %}
-			<a class="link pl1 f-link underline-hover" href="{{ item.nextItem.urlRel }}">{{ __('next') }} &nbsp;&rsaquo;</a>
+			<a class="link pl1 f-link underline-hover" href="{{ item.nextItem.urlRel }}">{{ settings.themes.cyanine.next|default('next') }} &nbsp;&rsaquo;</a>
 		{% endif %}					
 	</div>
 </div>

themes/cyanine/partials/footer.twig

@@ -1,7 +1,7 @@
 {% set nowYear = "now"|date("Y") %}
 
 <footer class="w-100 bl br bb lh-copy">
-	<div class="mw8 center pv3 flex-l">
+	<div class="grid-container center pv3 flex-l">
 		{% for column,key in settings.themes.cyanine.footercolumns %}
 			{% if settings.themes.cyanine[column] %}
 				<div class="w-100 pv3 ph3 ph4-l">
@@ -10,7 +10,7 @@
 			{% endif %}
 		{% endfor %}
 	</div>
-	<div class="mw8 center pv3 tc-l w100">
+	<div class="center pv3 tc-l w100">
 		{% if settings.year is empty or settings.year == nowYear %}
 		    {% set copyrightYears = nowYear %}
 		{% else %}

themes/cyanine/partials/navigation.twig

@@ -31,7 +31,7 @@
 {% import _self as macros %}
 
 {% if settings.themes.cyanine.collapseNav %}
-    <button id="expander" class="expander dim dn db-l link pointer w-100 ba pa2 mb3 f6">expand navigation</button>
+    <button id="expander" data-expandlabel="{{ settings.themes.cyanine.expand|default('expand navigation') }}" data-collapselabel="{{ settings.themes.cyanine.collapse|default('collapse navigation') }}" class="expander dim dn db-l link pointer w-100 ba pa2 mb3 f6">{{ settings.themes.cyanine.expand|default('expand navigation') }}</button>
 {% endif %}
 
 <ul class="cy-nav mainnavigation list pa0 menu">