Changeset 43

Timestamp:

10/02/07 06:34:55 (3 years ago)

Author:

bermi

Message:

Added settings for currently enabled languages. Closes #7, #9, #5 and #2

Files:

• trunk/src/config/DEFAULT-config.php (modified) (1 diff)
• trunk/src/includes/editam/controllers/page_controller.php (modified) (4 diffs)
• trunk/src/includes/editam/helpers/layout_helper.php (modified) (2 diffs)
• trunk/src/includes/editam/installers/editam_1/profiles/sample_website/profile.php (modified) (1 diff)
• trunk/src/includes/editam/models/page.php (modified) (1 diff)
• trunk/src/includes/editam/models/preferences/core_preferences.php (modified) (1 diff)
• trunk/src/includes/editam/views/admin/_user_menu.tpl (modified) (1 diff)
• trunk/src/includes/editam/views/form_fields/core/_time_zone.tpl (added)
• trunk/src/stylesheets/editam.css (modified) (1 diff)

trunk/src/config/DEFAULT-config.php

@@ -47 +47 @@
-defined('AK_ENVIRONMENT') ? null : define('AK_ENVIRONMENT', 'development');
-
-defined('AK_FRAMEWORK_DIR') ? null : define('AK_FRAMEWORK_DIR', '/home2/akeloso/akelosframework
+// defined('AK_FRAMEWORK_DIR') ? null : define('AK_FRAMEWORK_DIR', '/path/to/your/akelos
-
-include_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'boot.php');

trunk/src/includes/editam/controllers/page_controller.php

@@ -156 +156 @@
-        $is_new_page = !(!empty($this->params['id']) && $this->Page->id == $this->params['id']);
-        $this->is_homepage = !empty($this->params['is_first']) || !$is_new_page && $this->Page->isHomepage();
+
+        if(!$this->is_homepage && empty($this->ParentPage)){
+            if($this->ParentPage = $this->Page->nested_set->getRoot()){
+                $this->params['page']['parent_id'] = $this->ParentPage->getId();
+            }
+        }
+        
-        if(!empty($this->params['page'])){
-            $this->Page->setAttributes($this->params['page']);
@@ -175 +182 @@
-                    (empty($this->params['next']) || $this->params['next'] != 'child') ?
-                    array('action' => 'edit', 'id' => $this->Page->getId()) :
- 
+
-                    )
-                    );
-                    return ;
-                }
-            }
-        }elseif(!$this->is_homepage && empty($this->ParentPage)){
-            if($this->ParentPage = $this->Page->nested_set->getRoot()){
-                $this->params['page']['parent_id'] = $this->ParentPage->getId();
-            }
-        }
@@ -221 +224 @@
-    {
-        $this->layout = false;
-
+
-        if(!empty($this->params['content'])){
-            $from = empty($this->params['from']) ? 'html' : $this->params['from'];
@@ -272 +275 @@
-        $Page->layout->load();
-        $results[$Page->layout->getId()] = $Page->layout->getAttributes()." -- {%= pages_list :first = '/docs', :id = 'menu', :class = 'menu docs' %}";
-
+        
-        $this->layout = false;
-

trunk/src/includes/editam/helpers/layout_helper.php

@@ -52 +52 @@
-    function language_switch_list($langs = array(), $list_html_options = array(), $list_item_html_options = array())
-    {
-
+ user_actions
-        $list_html_options = array_merge($default_list_html_options, $list_html_options);
-        
@@ -71 +71 @@
-    {
-        return $this->_controller->url_helper->link_to($description,
-
+,'is_first'
-        $html_options);
-    }

trunk/src/includes/editam/installers/editam_1/profiles/sample_website/profile.php

@@ -80 +80 @@
-            'filter' => 'markdown',
-            'content' => 
-*admin* as your username and password to administer your website
+the username and password you provided when you installed Editam
-
-Editam is a content management platform based in these core principles and objectives

trunk/src/includes/editam/models/page.php

@@ -57 +57 @@
-    var $acts_as = array('nested_set' => array('order' => 'virtual DESC, title ASC','scope' => "locale = ?"));
-
-/*
-    function __construct()
-    {
-        $attributes = (array)func_get_args();
-        $Page = $this->init($attributes);
-        $Page->_fixed_locale = $Page->get('locale');
-    }
-*/    
-
-    function getLocale()
-    {
-        $default_lang = Ak::lang();
-
+!isset($this->_original_locale) || 
-        $locale = in_array($lang, Ak::langs()) ? $lang : $default_lang;
-        $this->_original_locale = empty($this->_original_locale) ? $locale : $this->_original_locale;
-        return $locale;
+    }
+    
+    function forceSetLocale($locale)
+    {
+        $this->_forced_locale = $locale;
-    }
-

trunk/src/includes/editam/models/preferences/core_preferences.php

@@ -72 +72 @@
-            if($config_file != $new_config_file){
-                Ak::file_put_contents(AK_CONFIG_DIR.DS.'config.php', $new_config_file);
+                
+                foreach (Ak::toArray($new_langs) as $lang){
+                    $lang = Ak::sanitize_include($lang,'paranoid');
+                    $locale_file = AK_CONFIG_DIR.DS.'locales'.DS.$lang.'.php';
+                    if(!file_exists($locale_file) && !empty($base_locale_file)){
+                        $base_locale = preg_replace('/(\$locale\[[\r\n\s\t]*[\'"]description[\'"][\r\n\s\t]*][\r\n\s\t]*=[\r\n\s\t]*[\'"])(.+)([\'"][\r\n\s\t]*;)/','$1'.$lang.'$3', Ak::file_get_contents($base_locale_file));
+                        Ak::file_put_contents($locale_file, $base_locale);
+                    }elseif (empty($base_locale_file)){
+                        $base_locale_file = $locale_file;
+                    }
+                }
-            }
-        }

trunk/src/includes/editam/views/admin/_user_menu.tpl

@@ -3 +3 @@
-  <li><%= link_to _"preferences", :controller => 'preferences', :action => 'setup' %></li>
-</ul>
+  <%= language_switch_list %>

trunk/src/stylesheets/editam.css

@@ -267 +267 @@
-}
-
-.language_switch li a{ color:#777; }
-
-.language_switch li{
-    font-size:70%;
-    float:right;
-    padding:0 3px 0 3px;
-}
-
-ul.language_switch{
-
-
-
+
-}
-