merge r10348 from trunk to branch 2.2

Clean code

git-svn-id: http://piwigo.org/svn/branches/2.2@10349 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 35 insertions, 34 deletions

diff --git a/plugins/LocalFilesEditor/admin.tpl b/plugins/LocalFilesEditor/template/admin.tpl
index d59df2f27..1761951d2 100644
--- a/plugins/LocalFilesEditor/admin.tpl
+++ b/plugins/LocalFilesEditor/template/admin.tpl
@@ -11,7 +11,7 @@
 {combine_css path="plugins/LocalFilesEditor/codemirror/mode/javascript/javascript.css"}
 {combine_css path="plugins/LocalFilesEditor/codemirror/mode/css/css.css"}
 {combine_css path="plugins/LocalFilesEditor/codemirror/mode/clike/clike.css"}
-{combine_css path="plugins/LocalFilesEditor/locfiledit.css"}
+{combine_css path="plugins/LocalFilesEditor/template/locfiledit.css"}
 
 {footer_script}
 if (document.getElementById("text") != null)
@@ -62,26 +62,27 @@ if (document.getElementById("text") != null)
   {/if}
 {/if}
 
-<div style="overflow:auto;"> {* top bar buttons *}
+{if isset ($zone_edit)}
+<div id="title_bar">
+{/if}
+
 {if !empty($show_default)}
 {foreach from=$show_default item=file name=default_loop}
-<span class="top_right">
-<a href="{$file.SHOW_DEFAULT}" onclick="window.open( this.href, 'local_file', 'location=no,toolbar=no,menubar=no,status=no,resizable=yes,scrollbars=yes,width=800,height=700' ); return false;">{'locfiledit_show_default'|@translate} "{$file.FILE}"</a>
+<span class="default_file">
+<a href="{$file.URL}" onclick="window.open( this.href, 'local_file', 'location=no,toolbar=no,menubar=no,status=no,resizable=yes,scrollbars=yes,width=800,height=700' ); return false;">{'locfiledit_show_default'|@translate} "{$file.FILE}"</a>
 </span>
 {if !($smarty.foreach.default_loop.last)}<br>{/if}
 {/foreach}
 {/if}
 
 {if isset ($zone_edit)}
-<b>{$zone_edit.FILE_NAME}</b>
-
-</div> {* top bar buttons *}
+<span class="file_name">{$zone_edit.FILE_NAME}</span>
+</div> {* title_bar *}
 
 <textarea rows="30" cols="90" name="text" id="text">{$zone_edit.CONTENT_FILE}</textarea>
-
 <br>
-
 <input class="submit" type="submit" value="{'locfiledit_save_file'|@translate}" name="submit"/>
+
 {if isset ($restore)}
 <input class="submit" type="submit" value="{'locfiledit_restore'|@translate}" name="restore" onclick="return confirm('{'locfiledit_restore_confirm'|@translate|escape:'javascript'}');"/>
 {/if}
@@ -91,6 +92,6 @@ if (document.getElementById("text") != null)
 {'locfiledit_save_bak'|@translate}
 {/if}
 
-{/if}
+{/if} {* zone_edit *}
 </div>
 </form>
diff --git a/plugins/LocalFilesEditor/locfiledit.css b/plugins/LocalFilesEditor/template/locfiledit.css
index bb59ec40c..10589bcec 100644
--- a/plugins/LocalFilesEditor/locfiledit.css
+++ b/plugins/LocalFilesEditor/template/locfiledit.css
@@ -3,32 +3,30 @@
   margin: 0 2em;
 }
 
-#LocalFilesEditor .top_right  {
-  float: right;
-  margin-right: 1%;
+#LocalFilesEditor #title_bar {
+  overflow: auto;
 }
 
-#LocalFilesEditor B {
+#LocalFilesEditor .file_name {
+  font-weight: bold;
   float: left;
 }
 
-#LocalFilesEditor TEXTAREA {
-  margin: 0.5em 0;
-  width: 99%;
-  height: 500px;
-  float: left;
+#LocalFilesEditor .default_file  {
+  float: right;
 }
 
 #LocalFilesEditor TD {
   padding: 0.5em;
 }
 
-.CodeMirror {
+#LocalFilesEditor TEXTAREA, .CodeMirror {
   background-color: #EEEEEE;
-  font-size: 1.3em;
+  font-family: monospace,Arial,sans-serif;
+  font-size: 1.2em;
   border: 1px solid #999999;
   margin: 0.5em 0;
-  width: 99%;
+  width: 100%;
   min-height: 500px;
   height: auto;
-}
+}
\ No newline at end of file
diff --git a/plugins/LocalFilesEditor/show_default.tpl b/plugins/LocalFilesEditor/template/show_default.tpl
index ef6970d41..cd6c3f318 100644
--- a/plugins/LocalFilesEditor/show_default.tpl
+++ b/plugins/LocalFilesEditor/template/show_default.tpl
@@ -1,8 +1,3 @@
-{html_head}
-<style type="text/css">#headbranch, #theHeader, #copyright {ldelim} display: none; }</style>
-{/html_head}
-{combine_script id="jquery"}
-
 {combine_script id="codemirror" path="plugins/LocalFilesEditor/codemirror/lib/codemirror.js"}
 {combine_script id="codemirror.xml" require="codemirror" path="plugins/LocalFilesEditor/codemirror/mode/xml/xml.js"}
 {combine_script id="codemirror.javascript" require="codemirror" path="plugins/LocalFilesEditor/codemirror/mode/javascript/javascript.js"}
@@ -16,20 +11,27 @@
 {combine_css path="plugins/LocalFilesEditor/codemirror/mode/javascript/javascript.css"}
 {combine_css path="plugins/LocalFilesEditor/codemirror/mode/css/css.css"}
 {combine_css path="plugins/LocalFilesEditor/codemirror/mode/clike/clike.css"}
-{combine_css path="plugins/LocalFilesEditor/locfiledit.css"}
+{combine_css path="plugins/LocalFilesEditor/template/locfiledit.css"}
 
 {footer_script}
 var editor = CodeMirror.fromTextArea(document.getElementById("text"), {ldelim}
-  matchBrackets: true,
   readOnly: true,
-  mode: "{$CODEMIRROR_MODE}",
-  tabMode: "shift"
+  mode: "application/x-httpd-php"
 });
 {/footer_script}
 
+{html_head}
+<style type="text/css">
+#headbranch, #theHeader, #copyright {ldelim} display: none; }
+</style>
+{/html_head}
+
 <div id="LocalFilesEditor">
-<div style="overflow:auto;"><b>{$TITLE}</b></div>
 
-<textarea id="text" rows="30" cols="90">{$DEFAULT_CONTENT}</textarea>
+<div id="title_bar">
+  <span class="file_name">{$TITLE}</span>
+</div>
+
+<textarea id="text" rows="30" cols="90" class="show_default_area">{$DEFAULT_CONTENT}</textarea>
 
 </div>