From b1a30b6ddefe7eb51d28721d3f5c0942cd0c0815 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 24 Nov 2017 16:46:31 +0900 Subject: [PATCH] White space fixes --- www/admin/edit_base.inc | 8 ++--- www/admin/edit_order.php | 6 ++-- www/admin/files.php | 8 ++--- www/admin/header.inc | 2 +- www/admin/set_paths.inc | 2 +- www/admin/smarty.inc | 2 +- www/configs/config.inc | 12 +++---- www/layout/admin/default/css/edit.css | 18 +++++------ www/layout/admin/default/javascript/edit.js | 32 +++++++++---------- .../admin/default/javascript/firebug.js | 2 +- .../admin/default/templates/edit_body.tpl | 2 +- .../admin/default/templates/edit_elements.tpl | 6 ++-- .../templates/main_content_special.tpl | 2 +- 13 files changed, 51 insertions(+), 51 deletions(-) diff --git a/www/admin/edit_base.inc b/www/admin/edit_base.inc index d5523e79..0562c4d8 100644 --- a/www/admin/edit_base.inc +++ b/www/admin/edit_base.inc @@ -64,7 +64,7 @@ } // smarty template engine (extended Translation version) $smarty = new SmartyML($lang); - + if (TARGET == 'live' || TARGET == 'remote') { // login @@ -156,7 +156,7 @@ if ($PAGES[$i]["menu"] && $PAGES[$i]["online"]) { $menuarray[] = $PAGES[$i]; - } + } } // split point for nav points @@ -182,7 +182,7 @@ } if ($menuarray[($i - 1)]["filename"] == $form->get_page_name()) { - $position = $i - 1; + $position = $i - 1; $menu_data[$j]['position'] = 1; } else @@ -322,7 +322,7 @@ $DATA['elements'] = $elements; $DATA['hidden'] = $form->form_create_hidden_fields(); $DATA['save_delete'] = $form->form_create_save_delete(); - } + } // debug data, if DEBUG flag is on, this data is print out $DEBUG_DATA['DEBUG'] = $DEBUG_TMPL; diff --git a/www/admin/edit_order.php b/www/admin/edit_order.php index 697033a4..822c5e3a 100644 --- a/www/admin/edit_order.php +++ b/www/admin/edit_order.php @@ -1,9 +1,9 @@ db_return($q)) diff --git a/www/admin/files.php b/www/admin/files.php index 6a7b1699..955c1ce1 100644 --- a/www/admin/files.php +++ b/www/admin/files.php @@ -261,7 +261,7 @@ $cms->debug('file_upload', "ERROR: $error | INI FSize: ".ini_get("upload_max_fil $cms->db_exec($q); } } // if not error - } + } if ($cms->action == 'delete' && $cms->action_yes == 'true') { $file_uid = $cms->action_id; @@ -332,7 +332,7 @@ $cms->debug('file_upload', "ERROR: $error | INI FSize: ".ini_get("upload_max_fil } // get th max entries $q = "SELECT COUNT(file_uid) FROM file "; - $q_search_where = "WHERE type in ('".str_replace(',', "','", $show_type)."') "; + $q_search_where = "WHERE type in ('".str_replace(',', "','", $show_type)."') "; if ($search_what) { $q_search_where .= "AND LOWER(name_en) LIKE '%".addslashes(strtolower($search_what))."%' OR name_ja LIKE '%".addslashes($search_what)."%' OR LOWER(file_name) LIKE '%".addslashes(strtolower($search_what))."%' "; @@ -429,7 +429,7 @@ $cms->debug('file_upload', "ERROR: $error | INI FSize: ".ini_get("upload_max_fil 'size_y' => $res['size_y'], 'file_uid' => $res['file_uid'], 'file_type' => $res['type'], - 'picture' => $cms->cache_pictures.$cms->adbCreateThumbnail(DEV_SCHEMA.'_'.$res['file_uid'], 80, 60, $res['type'], '', $cms->cache_pictures_root) + 'picture' => $cms->cache_pictures.$cms->adbCreateThumbnail(DEV_SCHEMA.'_'.$res['file_uid'], 80, 60, $res['type'], '', $cms->cache_pictures_root) ); } @@ -482,5 +482,5 @@ $cms->debug('file_upload', "ERROR: $error | INI FSize: ".ini_get("upload_max_fil //------------------------------ footer require("footer.inc"); //------------------------------ footer - + ?> diff --git a/www/admin/header.inc b/www/admin/header.inc index 42e35a94..f0898e11 100644 --- a/www/admin/header.inc +++ b/www/admin/header.inc @@ -30,7 +30,7 @@ //------------------------------ library include end //------------------------------ basic variable settings start - // set encoding + // set encoding if (!isset($encoding)) $encoding = DEFAULT_ENCODING; // set the default lang, if not given diff --git a/www/admin/set_paths.inc b/www/admin/set_paths.inc index 8a221b6d..41272903 100644 --- a/www/admin/set_paths.inc +++ b/www/admin/set_paths.inc @@ -20,7 +20,7 @@ $MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME; // just emergency fallback for language - // set encoding + // set encoding if ($_SESSION['DEFAULT_CHARSET']) $encoding = $_SESSION['DEFAULT_CHARSET']; elseif (!$encoding) diff --git a/www/admin/smarty.inc b/www/admin/smarty.inc index 8da2c12e..1a500a42 100644 --- a/www/admin/smarty.inc +++ b/www/admin/smarty.inc @@ -17,7 +17,7 @@ // set basic template path (tmp) // paths are set in the 'set_paths.inc' file - + // check if we have an external file with the template name if (file_exists($cms->includes.$cms->INC_TEMPLATE_NAME) && is_file($cms->includes.$cms->INC_TEMPLATE_NAME)) { diff --git a/www/configs/config.inc b/www/configs/config.inc index 397bfb8f..328ad76e 100644 --- a/www/configs/config.inc +++ b/www/configs/config.inc @@ -12,12 +12,12 @@ DEFINE('EDIT_SESSION_NAME', ""); // frontend DEFINE('SESSION_NAME', ""); - + /************* LANGUAGE / ENCODING *******/ DEFINE('DEFAULT_LANG', "en_utf8"); // default web page encoding setting DEFINE('DEFAULT_ENCODING', "UTF-8"); - + /************* PATHS *********************/ // ** NEW/BETTER DIR DECLARATIONS ** // path to original file (if symlink) @@ -58,7 +58,7 @@ DEFINE('DOCUMENTS', "documents/"); // files (pdfs) (below media) DEFINE('PDFS', "documents/"); - // css + // css DEFINE('CSS', "css/"); // js DEFINE('JS', "javascript/"); @@ -123,7 +123,7 @@ DEFINE('USE_PROTOTYPE', true); DEFINE('USE_SCRIPTACULOUS', false); DEFINE('USE_JQUERY', false); - + /************* LAYOUT WIDTHS *************/ DEFINE('PAGE_WIDTH', 800); // the default template name @@ -177,8 +177,8 @@ // show DEBUG override // true/false $DEBUG_FLAG[''] = true; - // set postgresql paths (schemas) - $DB_PATH[''] = PUBLIC_SCHEMA; + // set postgresql paths (schemas) + $DB_PATH[''] = PUBLIC_SCHEMA; // set the USE_DATABASE var, if there is nothing set, we assume TRUE $USE_DATABASE = defined('USE_DATABASE') ? USE_DATABASE : true; diff --git a/www/layout/admin/default/css/edit.css b/www/layout/admin/default/css/edit.css index 55fbbf8b..2c44db13 100644 --- a/www/layout/admin/default/css/edit.css +++ b/www/layout/admin/default/css/edit.css @@ -39,7 +39,7 @@ body { font-size : 9pt; font-family: Verdana,Arial,Helvetica,sans-serif; -} +} .small { @@ -119,17 +119,17 @@ input[type="password"] { border: 1px solid #999999; } - + input[type="submit"] { border: 1px solid #666666; } - + input[type="checkbox"] { border: 1px solid #999999; } - + input[type="radio"] { border: 1px solid #999999; @@ -144,26 +144,26 @@ input[type="button"] { border: 1px solid #999999; } - + textarea { border: 1px solid #999999; background-color: #efefef; } - + select { border: 1px solid #999999; background-color: #efefef; } -/* mouse over */ +/* mouse over */ input[type=submit]:hover, input[type=button]:hover, input[type="text"]:hover, input[type="password"]:hover, input[type="checkbox"]:hover, input[type="radio"]:hover, input[type="file"]:hover, textarea:hover, select:hover { border: 1px dashed red; } -/* selected */ +/* selected */ input[type=submit]:focus, input[type=button]:focus, input[type="password"]:focus, input[type="checkbox"]:focus, input[type="radio"]:focus, input[type="file"]:focus { border: 1px solid red; @@ -505,7 +505,7 @@ div.spacer } .edit_temp -{ +{ background-color: #FFDF6F; } diff --git a/www/layout/admin/default/javascript/edit.js b/www/layout/admin/default/javascript/edit.js index d62b4c02..95228ca8 100644 --- a/www/layout/admin/default/javascript/edit.js +++ b/www/layout/admin/default/javascript/edit.js @@ -7,7 +7,7 @@ */ var clientPC = navigator.userAgent.toLowerCase(); // Get client info var is_gecko = ((clientPC.indexOf('gecko') != -1) && (clientPC.indexOf('spoofer') == -1) - && (clientPC.indexOf('khtml') == -1) && (clientPC.indexOf('netscape/7.0') == -1)); + && (clientPC.indexOf('khtml') == -1) && (clientPC.indexOf('netscape/7.0') == -1)); var is_safari = ((clientPC.indexOf('AppleWebKit') != -1) && (clientPC.indexOf('spoofer') == -1)); var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled )); if (clientPC.indexOf('opera') != -1) @@ -62,18 +62,18 @@ function expandTA(ta_id) // DESC: shows or hides the menu function ShowHideMenu(status, id) { - if (status == 'show') - { - document.getElementById(id).style.visibility = 'visible'; - if (document.getElementById('search_results').innerHTML) - document.getElementById('search_results').style.visibility = 'visible'; - } - else if (status == 'hide') - { - document.getElementById(id).style.visibility = 'hidden'; - if (document.getElementById('search_results').style.visibility == 'visible') - document.getElementById('search_results').style.visibility = 'hidden'; - } + if (status == 'show') + { + document.getElementById(id).style.visibility = 'visible'; + if (document.getElementById('search_results').innerHTML) + document.getElementById('search_results').style.visibility = 'visible'; + } + else if (status == 'hide') + { + document.getElementById(id).style.visibility = 'hidden'; + if (document.getElementById('search_results').style.visibility == 'visible') + document.getElementById('search_results').style.visibility = 'hidden'; + } } function ShowHideDiv(id) @@ -132,7 +132,7 @@ function getScrollOffset() left = window.pageXOffset || (window.document.documentElement.scrollLeft || window.document.body.scrollLeft); top = window.pageYOffset || (window.document.documentElement.scrollTop || window.document.body.scrollTop); return {left: left, top: top}; -} +} // METHOD: setCenter // PARAMS: id to set center @@ -153,9 +153,9 @@ function setCenter(id, left, top) $(id).setStyle ({ left: parseInt((viewport.width / 2) - (dimensions.width / 2) + offset.left) + 'px' }); - } + } if (top) - { + { $(id).setStyle ({ top: parseInt((viewport.height / 2) - (dimensions.height / 2) + offset.top) + 'px' }); diff --git a/www/layout/admin/default/javascript/firebug.js b/www/layout/admin/default/javascript/firebug.js index 7d952ad2..0d54b957 100644 --- a/www/layout/admin/default/javascript/firebug.js +++ b/www/layout/admin/default/javascript/firebug.js @@ -1,5 +1,5 @@ /* vim: set fileencoding=utf-8 expandtab! shiftwidth=2 : */ -/* modified version of firebugx.js which can cope with +/* modified version of firebugx.js which can cope with * firebug 1.2+ and the webkit console */ var ConsoleSetup = function() { diff --git a/www/layout/admin/default/templates/edit_body.tpl b/www/layout/admin/default/templates/edit_body.tpl index 53c7039b..9d2f2bd5 100644 --- a/www/layout/admin/default/templates/edit_body.tpl +++ b/www/layout/admin/default/templates/edit_body.tpl @@ -26,7 +26,7 @@ {foreach from=$form_error_msg item=element key=key name=loop} - {include file="edit_error_msg.tpl"} + {include file="edit_error_msg.tpl"} {/foreach} diff --git a/www/layout/admin/default/templates/edit_elements.tpl b/www/layout/admin/default/templates/edit_elements.tpl index fd61e1a1..bd98cb8f 100644 --- a/www/layout/admin/default/templates/edit_elements.tpl +++ b/www/layout/admin/default/templates/edit_elements.tpl @@ -24,11 +24,11 @@ {html_checkboxes values=$element.data.value output=$element.data.output selected=$element.data.checked} {/if} {if $element.type == 'text'} - + {/if} {if $element.type == 'password'} Password: {if $element.data.HIDDEN_value}{t}Password set{/t}{/if}
- Confirm: + Confirm: {/if} {if $element.type == 'date'} @@ -71,7 +71,7 @@ {* now each line of data *} {foreach from=$line item=line_item key=line_key}
- {$key}: + {$key}: diff --git a/www/layout/admin/default/templates/main_content_special.tpl b/www/layout/admin/default/templates/main_content_special.tpl index ddb7176a..b0db450f 100644 --- a/www/layout/admin/default/templates/main_content_special.tpl +++ b/www/layout/admin/default/templates/main_content_special.tpl @@ -52,7 +52,7 @@ var load_id = {if $primary_key}{$primary_key}{else}0{/if}; {/foreach} - +
{* START CONTENT *} {include file="$CONTENT_INCLUDE"}