From 9190846c824738eaa3ca4471c8bd5dd7a5de4a93 Mon Sep 17 00:00:00 2001
From: messerbill <ole.hoppe@gmx.de>
Date: Sun, 29 Sep 2013 13:10:54 +0200
Subject: [PATCH 1/2] some UI changes

---
 sai/modules/saimod_sys_locale/saimod_sys_locale.php   | 11 +++++++----
 .../saimod_sys_locale/saimod_sys_locale_submit.js     |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale.php b/sai/modules/saimod_sys_locale/saimod_sys_locale.php
index 724948e..6592984 100644
--- a/sai/modules/saimod_sys_locale/saimod_sys_locale.php
+++ b/sai/modules/saimod_sys_locale/saimod_sys_locale.php
@@ -9,7 +9,8 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
 
     public static function sai_mod__SYSTEM_SAI_saimod_sys_locale(){
         $result =   '<h3>Locale String</h3>'.
-                    '<input type="submit" value="Add" class="btn add_form"><br><table class="table table-hover table-condensed" style="overflow: auto;">'.        
+                    //<input type="submit" value="Add" class="btn add_form">
+                    '<br><table class="table table-hover table-condensed" style="overflow: auto;">'.        
                     '<tr>'.'<th>'.'ID'.'</th>'.'<th>'.'Category'.'</th>';
                     
                     foreach (self::getLanguages() as $lang){
@@ -26,10 +27,10 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
             $res = $con->query('SELECT * FROM system_locale_string ORDER BY category ASC;');
         }
         while($r = $res->next()){
-            $result .= '<tr>'.'<td>'.$r["id"].'<br><input type="submit" class="btn-danger delete_content" value="delete" id="'.$r["id"].'">'.'<input type="submit" class="btn" value="edit" name="'.$r["id"].'">'.'</td>'.'<td>'.$r["category"].'</td>';
+            $result .= '<tr>'.'<td style="padding-bottom: 5px;">'.$r["id"].'<br><br><input type="submit" class="btn-danger delete_content" value="delete" id="'.$r["id"].'">'.'<input type="submit" class="btn" value="edit" style="margin-left: 3px;" name="'.$r["id"].'">'.'</td>'.'<td>'.$r["category"].'</td>';
                     foreach ($languages as $columns){
                         //echo "+tututututututut:".$r[$columns]."nochmal tututututututut";
-                        $result .= '<td>'.$r[$columns].'</td>';
+                        $result .= '<td>'.utf8_encode($r[$columns]).'</td>';
                         //$_POST[$r["id"]] = $r[$columns];
                     }
                     
@@ -42,6 +43,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
     }
     
     public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_edit($id, $lang, $newtext){
+         $charset = 'utf-8';
          $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
          $res = null;
         if(\SYSTEM\system::isSystemDbInfoPG()){
@@ -111,7 +113,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
             $fu = 0;
             foreach ($languages as $columns){                        
                 $result .= '<td>
-                            <div class="dialog">'.
+                            <div class="dialog" style="padding-bottom: 5px;">'.
                                 '<textarea name="content" class="tinymce" style="width: 100%" id="edit_field_'.$r["id"].'_'.$columns.'">'.$r[$columns].'</textarea>'.
                             '</div>
                             <input type="submit" class="btn edit_content" value="edit" lang="'.$columns.'" name="'.$r["id"].'"><br></td>';
@@ -120,6 +122,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         }
         $result .=  '<br><input type="submit" class="btn localeMain" value="back">'.'<script>tinymce.init({
     selector: "textarea",
+    entity_encoding : "raw",
     plugins: [
         "advlist autolink lists link image charmap print preview anchor",
         "searchreplace visualblocks code fullscreen",
diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale_submit.js b/sai/modules/saimod_sys_locale/saimod_sys_locale_submit.js
index 29b7d79..4944f5d 100644
--- a/sai/modules/saimod_sys_locale/saimod_sys_locale_submit.js
+++ b/sai/modules/saimod_sys_locale/saimod_sys_locale_submit.js
@@ -41,7 +41,7 @@ function init__SYSTEM_SAI_saimod_sys_locale_edit(){
          tinyMCE.triggerSave();
          $.getJSON(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_locale&action=edit&id='+$(this).attr('name')+'&lang='+$(this).attr('lang')+'&newtext='+$('#edit_field_'+$(this).attr('name')+'_'+$(this).attr('lang')).val(), 
          function(data){
-             if (data.status == false){ alert("false"); } else { alert("true");}
+             if (data.status == false){ alert("Changes could not be changed."); } else { alert("Changes has been saved.");}
          });
     });
 }

From 0822c5f9d2dce8a309cbd6158b917c9faff08b2e Mon Sep 17 00:00:00 2001
From: messerbill <ole.hoppe@gmx.de>
Date: Sun, 29 Sep 2013 15:42:07 +0200
Subject: [PATCH 2/2] special characters now work in any contents

---
 sai/modules/saimod_sys_locale/saimod_sys_locale.php | 10 ++++++----
 sai/modules/saimod_sys_sai/carousel.tpl             |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale.php b/sai/modules/saimod_sys_locale/saimod_sys_locale.php
index 6592984..957a1e2 100644
--- a/sai/modules/saimod_sys_locale/saimod_sys_locale.php
+++ b/sai/modules/saimod_sys_locale/saimod_sys_locale.php
@@ -49,7 +49,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         if(\SYSTEM\system::isSystemDbInfoPG()){
             $res = $con->prepare('newText' ,'UPDATE system.locale_string SET "'.$lang.'"=$1 WHERE id=$2;', array($newtext, $id));
         } else {
-            $res = $con->prepare('newText' ,'UPDATE system_locale_string SET '.$lang.'=? WHERE id=?;', array($newtext, $id));
+            $res = $con->prepare('newText' ,'UPDATE system_locale_string SET '.$lang.'=? WHERE id=?;', array(utf8_decode($newtext), $id));
         }
         return $res->affectedRows() == 0 ? \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no rows affected")) : \SYSTEM\LOG\JsonResult::ok();
     }
@@ -114,7 +114,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
             foreach ($languages as $columns){                        
                 $result .= '<td>
                             <div class="dialog" style="padding-bottom: 5px;">'.
-                                '<textarea name="content" class="tinymce" style="width: 100%" id="edit_field_'.$r["id"].'_'.$columns.'">'.$r[$columns].'</textarea>'.
+                                '<textarea name="content" class="tinymce" style="width: 100%" id="edit_field_'.$r["id"].'_'.$columns.'">'.utf8_encode($r[$columns]).'</textarea>'.
                             '</div>
                             <input type="submit" class="btn edit_content" value="edit" lang="'.$columns.'" name="'.$r["id"].'"><br></td>';
             }
@@ -123,12 +123,14 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         $result .=  '<br><input type="submit" class="btn localeMain" value="back">'.'<script>tinymce.init({
     selector: "textarea",
     entity_encoding : "raw",
+    theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
     plugins: [
         "advlist autolink lists link image charmap print preview anchor",
         "searchreplace visualblocks code fullscreen",
-        "insertdatetime media table contextmenu paste moxiemanager"
+        "insertdatetime media table contextmenu paste moxiemanager",
+        "textcolor"
     ],
-    toolbar: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
+    toolbar: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent"
 });</script>';
         return $result; 
     }
diff --git a/sai/modules/saimod_sys_sai/carousel.tpl b/sai/modules/saimod_sys_sai/carousel.tpl
index aeab5f2..b4a0336 100644
--- a/sai/modules/saimod_sys_sai/carousel.tpl
+++ b/sai/modules/saimod_sys_sai/carousel.tpl
@@ -1,5 +1,5 @@
 <div class="masthead">
-    <h3 class="muted">Design.Simple.Fast.Reliable.Innovative.</h3>
+    <h3 class="muted">Design. Simple. Fast. Reliable. Innovative.</h3>
     <h4 class="text-info">We write awesome code and we use <a href="http://getbootstrap.com/">Twitter Bootstrap.</a></h4>
 </div>
 <br>