Added locale css demonstration per pi-engine#1195

taiwen · Aug 29, 2014 · 7e417b8 · 7e417b8
1 parent 439d16c
commit 7e417b8
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 9 deletions.
diff --git a/lib/Pi/View/Helper/Css.php b/lib/Pi/View/Helper/Css.php
@@ -26,7 +26,7 @@
  *
  *  // Load specific file with attributes
  *  $this->css('some.css',
- *             array('conditional' => '...', 'postion' => 'prepend'));
+ *             array('conditional' => '...', 'position' => 'prepend'));
  *
  *  // Load a list of files
  *  $this->css(array(

diff --git a/lib/Pi/View/Helper/I18n.php b/lib/Pi/View/Helper/I18n.php
@@ -19,7 +19,7 @@
  * Usage inside a phtml template
  *
  * ```
- *  $this->i18n('theme/default', 'main');
+ *  $this->i18n('theme/default', 'default');
  *  $this->i18n('module/demo', 'block');
  * ```
  *

diff --git a/usr/theme/default/asset/locale/en/locale.css b/usr/theme/default/asset/locale/en/locale.css
@@ -0,0 +1,12 @@
+/**
+ * Locale css file
+ *
+ * Load in a theme template
+ * ```
+ *  $this->css($this->assetLocale('locale.css'));
+ * ```
+ */
+.rtl {
+    direction: RTL;
+    unicode-bidi: embed;
+}
diff --git a/usr/theme/default/asset/locale/en/locale.js b/usr/theme/default/asset/locale/en/locale.js
@@ -0,0 +1,8 @@
+/**
+ * Locale js file
+ *
+ * Load in a theme template
+ * ```
+ *  $this->js($this->assetLocale('locale.js'));
+ * ```
+ */
diff --git a/usr/theme/default/asset/locale/en/rtl.css b/usr/theme/default/asset/locale/en/rtl.css
diff --git a/usr/theme/default/asset/locale/en/rtl.js b/usr/theme/default/asset/locale/en/rtl.js
diff --git a/usr/theme/default/asset/locale/fa/locale.css b/usr/theme/default/asset/locale/fa/locale.css
@@ -0,0 +1,12 @@
+/**
+ * Locale css file
+ *
+ * Load in a theme template
+ * ```
+ *  $this->css($this->assetLocale('locale.css'));
+ * ```
+ */
+.rtl {
+    direction: RTL;
+    unicode-bidi: embed;
+}
diff --git a/usr/theme/default/asset/locale/fa/locale.js b/usr/theme/default/asset/locale/fa/locale.js
@@ -0,0 +1,8 @@
+/**
+ * Locale js file
+ *
+ * Load in a theme template
+ * ```
+ *  $this->js($this->assetLocale('locale.js'));
+ * ```
+ */
diff --git a/usr/theme/default/asset/locale/zh-cn/locale.css b/usr/theme/default/asset/locale/zh-cn/locale.css
@@ -0,0 +1,12 @@
+/**
+ * Locale css file
+ *
+ * Load in a theme template
+ * ```
+ *  $this->css($this->assetLocale('locale.css'));
+ * ```
+ */
+.rtl {
+    direction: RTL;
+    unicode-bidi: embed;
+}
diff --git a/usr/theme/default/asset/locale/zh-cn/locale.js b/usr/theme/default/asset/locale/zh-cn/locale.js
@@ -0,0 +1,8 @@
+/**
+ * Locale js file
+ *
+ * Load in a theme template
+ * ```
+ *  $this->js($this->assetLocale('locale.js'));
+ * ```
+ */
diff --git a/usr/theme/default/template/layout-admin.phtml b/usr/theme/default/template/layout-admin.phtml
@@ -24,6 +24,9 @@ $this->bootstrap(array(
 // Load admin.css
 $this->css($this->assetTheme('css/admin.css'));
 
+// Load localization css
+$this->css($this->assetLocale('locale.css'));
+
 // Explicitly load favicon
 // @see http://en.wikipedia.org/wiki/Favicon
 $this->headLink(array(

diff --git a/usr/theme/default/template/layout-front.phtml b/usr/theme/default/template/layout-front.phtml
@@ -24,6 +24,9 @@ $this->bootstrap(array(
 // Load front.css
 $this->css($this->assetTheme('css/front.css'));
 
+// Load localization css
+$this->css($this->assetLocale('locale.css'));
+
 // Apple icons
 // Apple icon for iphone
 $this->headLink(array(

diff --git a/usr/theme/default/template/layout-simple.phtml b/usr/theme/default/template/layout-simple.phtml
@@ -24,6 +24,9 @@ $this->bootstrap(array(
 // Load front.css
 $this->css($this->assetTheme('css/front.css'));
 
+// Load localization css
+$this->css($this->assetLocale('locale.css'));
+
 // Apple icons
 // Apple icon for iphone
 $this->headLink(array(
@@ -96,7 +99,7 @@ $module = Pi::service('module')->current();
                 <div class="pi-module-content" ng-app="<?php echo $module; ?>">
                     <?php echo $content; ?>
                 </div>
-            </div>
+            </div>>
         <?php } ?>
         <!-- Module content ends -->
 

diff --git a/usr/theme/default/template/layout-style.phtml b/usr/theme/default/template/layout-style.phtml
@@ -31,7 +31,7 @@ $module = Pi::service('module')->current();
                 <div class="pi-module-content" ng-app="<?php echo $module; ?>">
                     <?php echo $content; ?>
                 </div>
-            </div>
+            </div>>
         <?php } ?>
     </div>
 

diff --git a/usr/theme/pi/template/layout-front.phtml b/usr/theme/pi/template/layout-front.phtml
@@ -18,6 +18,8 @@ $this->bootstrap(array(
     'font-awesome/css/font-awesome.min.css'
 ));
 $this->css($this->assetTheme('css/front.css'));
+$this->css($this->assetLocale('locale.css'));
+
 $this->headLink(array(
     'rel'   => 'apple-touch-icon',
     'href'  => $this->assetTheme('image/touch-icon-iphone.png')
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ $module = Pi::service('module')->current(); @@
                     <div class="pi-module-content" ng-app="<?php echo $module; ?>">
                         <?php echo $content; ?>
                     </div>
-                </div>
+                </div>>
             <?php } ?>
         </div>
@@ Expand Down @@