Merge branch 'release/0.10.1'

pagekit · Feb 24, 2016 · 04123aa · 04123aa
2 parents a5216c7 + 4b4849e
commit 04123aa
Show file tree

Hide file tree

Showing 68 changed files with 2,513 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
-**/app/bundle/**/*.js
+/app/bundle/*
 /css
-.DS_Store
+/node_modules
+.DS_Store
+.idea
+*.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
-## 0.10.0
+## 0.10.1 (February 24, 2016)
+
+### Added
+- Added optional parallax effect for hero image
+- Added style option for top, main and bottom sections
+- Added optional off-canvas logo
+- Added translations
+
+## 0.10.0 (December 15, 2015)
 
 ### Changed
 - Switched to Vuejs 1.0
@@ -14,27 +22,27 @@
 - Minor tweaks for alert, dropdown and icon
 
 ### Removed
-- Text centering in footer
+- Removed text centering in footer
 
 ## 0.9.3 (October 16, 2015)
 
 ### Fixed
-- Missing css folder
+- Fixed missing CSS folder
 
 ## 0.9.2 (October 14, 2015)
 
 ### Added
-- Missing meta data in post view
+- Added missing meta data in post view
 
 ### Fixed
-- Widget html class
-- Date conversion to ISO8601 in blog views
+- Fixed widget html class
+- Fixed date conversion to ISO8601 in blog views
 
 ## 0.9.1 (September 14, 2015)
 
 ### Fixed
-- Undefined index `hero`
-- Blog markup
+- Fixed undefined index `hero`
+- Fixed blog markup
 
 ## 0.9.0 (September 10, 2015)
 

diff --git a/app/components/node-theme.vue b/app/components/node-theme.vue
@@ -48,14 +48,47 @@
                 <p class="uk-form-controls-condensed">
                     <label><input type="checkbox" v-model="node.theme.hero_contrast"> {{ 'Invert colors' | trans }}</label>
                 </p>
-                <p class="uk-form-controls-condensed uk-margin-bottom">
+                <p class="uk-form-controls-condensed">
                     <label><input type="checkbox" v-model="node.theme.navbar_transparent"> {{ 'Transparent navbar as overlay' | trans }}</label>
                 </p>
+                <p class="uk-form-controls-condensed uk-margin-bottom">
+                    <label><input type="checkbox" v-model="node.theme.hero_parallax"> {{ 'Enable parallax effect' | trans }}</label>
+                </p>
                 <p class="uk-form-controls-condensed uk-form-width-large"><input-image :source.sync="node.theme.hero_image"></input-image></p>
                 <p class="uk-form-help-block">{{ 'Select a background image for the hero position.' | trans }}</p>
             </div>
         </div>
 
+        <div class="uk-form-row">
+            <label for="form-top-style" class="uk-form-label">{{ 'Top Style' | trans }}</label>
+            <div class="uk-form-controls">
+                <select id="form-top-style" class="uk-form-width-large" v-model="node.theme.top_style">
+                    <option value="uk-block-default">{{ 'Default' | trans }}</option>
+                    <option value="uk-block-muted">{{ 'Muted' | trans }}</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="uk-form-row">
+            <label for="form-main-style" class="uk-form-label">{{ 'Main Style' | trans }}</label>
+            <div class="uk-form-controls">
+                <select id="form-main-style" class="uk-form-width-large" v-model="node.theme.main_style">
+                    <option value="uk-block-default">{{ 'Default' | trans }}</option>
+                    <option value="uk-block-muted">{{ 'Muted' | trans }}</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="uk-form-row">
+            <label for="form-bottom-style" class="uk-form-label">{{ 'Bottom Style' | trans }}</label>
+            <div class="uk-form-controls">
+                <select id="form-bottom-style" class="uk-form-width-large" v-model="node.theme.bottom_style">
+                    <option value="uk-block-default">{{ 'Default' | trans }}</option>
+                    <option value="uk-block-muted">{{ 'Muted' | trans }}</option>
+                </select>
+            </div>
+        </div>
+
     </div>
 
 </template>

diff --git a/app/components/site-theme.vue b/app/components/site-theme.vue
@@ -19,6 +19,14 @@
             </div>
         </div>
 
+        <div class="uk-form-row">
+            <label class="uk-form-label">{{ 'Logo Off-canvas' | trans }}</label>
+            <div class="uk-form-controls uk-form-width-large">
+                <input-image :source.sync="config.logo_offcanvas"></input-image>
+                <p class="uk-form-help-block">{{ 'Select an optional logo for the off-canvas menu.' | trans }}</p>
+            </div>
+        </div>
+
     </div>
 
 </template>
@@ -41,8 +49,8 @@
 
             save: function() {
 
-                this.$http.post('admin/system/settings/config', {name: this.name, config: this.config}).error(function (data) {
-                    this.$notify(data, 'danger');
+                this.$http.post('admin/system/settings/config', {name: this.name, config: this.config}).catch(function (res) {
+                    this.$notify(res.data, 'danger');
                 });
 
             }

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "pagekit/theme-one",
     "type": "pagekit-theme",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "title": "One",
     "description": "Pagekit's default theme.",
     "license": "MIT",

diff --git a/index.php b/index.php
@@ -42,7 +42,11 @@
         'hero_image' => '',
         'hero_viewport' => '',
         'hero_contrast' => '',
-        'navbar_transparent' => ''
+        'hero_parallax' => '',
+        'navbar_transparent' => '',
+        'top_style' => 'uk-block-muted',
+        'main_style' => 'uk-block-default',
+        'bottom_style' => 'uk-block-muted'
 
     ],
 
@@ -69,7 +73,8 @@
      */
     'config' => [
 
-        'logo_contrast' => ''
+        'logo_contrast' => '',
+        'logo_offcanvas' => ''
 
     ],
 
@@ -102,7 +107,8 @@
 
             $classes = [
                 'navbar' => 'tm-navbar',
-                'hero' => ''
+                'hero' => '',
+                'parallax' => ''
             ];
 
             $sticky = [
@@ -138,6 +144,10 @@
 
             }
 
+            if ($event['hero_parallax'] && $view->position()->exists('hero') && $event['hero_image']) {
+                $classes['parallax'] = 'data-uk-parallax="{bg: \'-400\'}"';
+            }
+
             if ($event['hero_contrast'] && $event['hero_image']) {
                 $classes['hero'] .= ' uk-contrast';
             }

diff --git a/languages/ar_EG/messages.php b/languages/ar_EG/messages.php
@@ -0,0 +1,41 @@
+<?php return array (
+  'Title Size' => '',
+  'Muted' => 'صامتة',
+  'Main Style' => '',
+  'H3' => '',
+  'Full viewport height' => '',
+  'Alignment' => '',
+  'Show the sidebar before the content.' => '',
+  'Center the title and content.' => '',
+  'Read more' => '',
+  'Select an alternative logo which looks great on images.' => '',
+  'Box Secondary' => '',
+  'Select a background image for the hero position.' => '',
+  'Transparent navbar as overlay' => '',
+  'H1' => '',
+  'Theme' => '',
+  'None' => '',
+  'Sidebar' => '',
+  'Default' => '',
+  'Top Style' => '',
+  'Written by %name% on %date%' => '',
+  'HTML Class' => '',
+  'Logo Contrast' => '',
+  'Invert colors' => '',
+  'Box Primary' => '',
+  'Logo Off-canvas' => '',
+  'Save' => 'حفظ',
+  'Hero Image' => '',
+  'Title' => 'عنوان',
+  'H2' => '',
+  'Header' => '',
+  'Panel Style' => '',
+  'Hide Title' => '',
+  'Bottom Style' => '',
+  '{0} No comments|{1} %num% Comment|]1,Inf[ %num% Comments' => '',
+  'Enable parallax effect' => '',
+  'Extra large title.' => '',
+  'H4' => '',
+  'Select an optional logo for the off-canvas menu.' => '',
+  'Box' => '',
+);
diff --git a/languages/ar_SA/messages.php b/languages/ar_SA/messages.php
@@ -0,0 +1,41 @@
+<?php return array (
+  'Title Size' => 'حجم النص',
+  'Muted' => 'صامت',
+  'Main Style' => 'التصميم الرئيسي',
+  'H3' => 'حجم 3',
+  'Full viewport height' => 'ملئ الشاشة',
+  'Alignment' => 'المحاذاة',
+  'Show the sidebar before the content.' => 'إظهار الشريط الجانبي قبل المحتوى ',
+  'Center the title and content.' => 'توسيط العنوان و الوسائط',
+  'Read more' => 'إقرأ المزيد',
+  'Select an alternative logo which looks great on images.' => 'إختيار شعار بديل مناسب للصورة',
+  'Box Secondary' => 'الصندوق الثانوي',
+  'Select a background image for the hero position.' => 'إختيار صورة الخلفية كصورة رئيسية',
+  'Transparent navbar as overlay' => 'شفافية الشريط',
+  'H1' => 'حجم 1',
+  'Theme' => 'القالب',
+  'None' => 'لاشيء',
+  'Sidebar' => 'الشريط الجانبي',
+  'Default' => 'إفتراضي',
+  'Top Style' => 'أفضل قالب',
+  'Written by %name% on %date%' => 'الكتابة على الشكل %name% الى %date%',
+  'HTML Class' => 'HTML كلاس',
+  'Logo Contrast' => 'تباين الشعار',
+  'Invert colors' => 'الألوان "الوضع المعكوس"',
+  'Box Primary' => 'الصندوق الأولي',
+  'Logo Off-canvas' => 'إيقاف الشعار الزيتي',
+  'Save' => 'حفظ',
+  'Hero Image' => 'الصورة الرئيسية',
+  'Title' => 'العنوان',
+  'H2' => 'حجم 2',
+  'Header' => 'الرأس',
+  'Panel Style' => 'شكل اللوحة',
+  'Hide Title' => 'إخفاء العنوان',
+  'Bottom Style' => 'التصميم الاخير',
+  '{0} No comments|{1} %num% Comment|]1,Inf[ %num% Comments' => '{0} لا تعليق {1} %num% التعليق ',
+  'Enable parallax effect' => 'تمكين التأثبر parallax',
+  'Extra large title.' => 'نص عريض',
+  'H4' => 'حجم 4',
+  'Select an optional logo for the off-canvas menu.' => '',
+  'Box' => 'صندوق',
+);
diff --git a/languages/az@latin/messages.php b/languages/az@latin/messages.php
@@ -0,0 +1,41 @@
+<?php return array (
+  'Title Size' => '',
+  'Muted' => '',
+  'Main Style' => '',
+  'H3' => '',
+  'Full viewport height' => '',
+  'Alignment' => '',
+  'Show the sidebar before the content.' => '',
+  'Center the title and content.' => '',
+  'Read more' => '',
+  'Select an alternative logo which looks great on images.' => '',
+  'Box Secondary' => '',
+  'Select a background image for the hero position.' => '',
+  'Transparent navbar as overlay' => '',
+  'H1' => '',
+  'Theme' => '',
+  'None' => '',
+  'Sidebar' => '',
+  'Default' => '',
+  'Top Style' => '',
+  'Written by %name% on %date%' => '',
+  'HTML Class' => '',
+  'Logo Contrast' => '',
+  'Invert colors' => '',
+  'Box Primary' => '',
+  'Logo Off-canvas' => '',
+  'Save' => '',
+  'Hero Image' => '',
+  'Title' => '',
+  'H2' => '',
+  'Header' => '',
+  'Panel Style' => '',
+  'Hide Title' => '',
+  'Bottom Style' => '',
+  '{0} No comments|{1} %num% Comment|]1,Inf[ %num% Comments' => '',
+  'Enable parallax effect' => '',
+  'Extra large title.' => '',
+  'H4' => '',
+  'Select an optional logo for the off-canvas menu.' => '',
+  'Box' => '',
+);
diff --git a/languages/az_AZ/messages.php b/languages/az_AZ/messages.php
@@ -0,0 +1,41 @@
+<?php return array (
+  'Title Size' => '',
+  'Muted' => '',
+  'Main Style' => '',
+  'H3' => '',
+  'Full viewport height' => '',
+  'Alignment' => '',
+  'Show the sidebar before the content.' => '',
+  'Center the title and content.' => '',
+  'Read more' => '',
+  'Select an alternative logo which looks great on images.' => '',
+  'Box Secondary' => '',
+  'Select a background image for the hero position.' => '',
+  'Transparent navbar as overlay' => '',
+  'H1' => '',
+  'Theme' => '',
+  'None' => '',
+  'Sidebar' => '',
+  'Default' => '',
+  'Top Style' => '',
+  'Written by %name% on %date%' => '',
+  'HTML Class' => '',
+  'Logo Contrast' => '',
+  'Invert colors' => '',
+  'Box Primary' => '',
+  'Logo Off-canvas' => '',
+  'Save' => '',
+  'Hero Image' => '',
+  'Title' => '',
+  'H2' => '',
+  'Header' => '',
+  'Panel Style' => '',
+  'Hide Title' => '',
+  'Bottom Style' => '',
+  '{0} No comments|{1} %num% Comment|]1,Inf[ %num% Comments' => '',
+  'Enable parallax effect' => '',
+  'Extra large title.' => '',
+  'H4' => '',
+  'Select an optional logo for the off-canvas menu.' => '',
+  'Box' => '',
+);