White space fixes

This commit is contained in:
2017-11-24 16:46:31 +09:00
parent 967af4dc37
commit b1a30b6dde
13 changed files with 51 additions and 51 deletions

View File

@@ -64,7 +64,7 @@
} }
// smarty template engine (extended Translation version) // smarty template engine (extended Translation version)
$smarty = new SmartyML($lang); $smarty = new SmartyML($lang);
if (TARGET == 'live' || TARGET == 'remote') if (TARGET == 'live' || TARGET == 'remote')
{ {
// login // login
@@ -156,7 +156,7 @@
if ($PAGES[$i]["menu"] && $PAGES[$i]["online"]) if ($PAGES[$i]["menu"] && $PAGES[$i]["online"])
{ {
$menuarray[] = $PAGES[$i]; $menuarray[] = $PAGES[$i];
} }
} }
// split point for nav points // split point for nav points
@@ -182,7 +182,7 @@
} }
if ($menuarray[($i - 1)]["filename"] == $form->get_page_name()) if ($menuarray[($i - 1)]["filename"] == $form->get_page_name())
{ {
$position = $i - 1; $position = $i - 1;
$menu_data[$j]['position'] = 1; $menu_data[$j]['position'] = 1;
} }
else else
@@ -322,7 +322,7 @@
$DATA['elements'] = $elements; $DATA['elements'] = $elements;
$DATA['hidden'] = $form->form_create_hidden_fields(); $DATA['hidden'] = $form->form_create_hidden_fields();
$DATA['save_delete'] = $form->form_create_save_delete(); $DATA['save_delete'] = $form->form_create_save_delete();
} }
// debug data, if DEBUG flag is on, this data is print out // debug data, if DEBUG flag is on, this data is print out
$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL; $DEBUG_DATA['DEBUG'] = $DEBUG_TMPL;

View File

@@ -1,9 +1,9 @@
<? <?
/******************************************************************** /********************************************************************
* AUTHOR: Clemens Schwaighofer * AUTHOR: Clemens Schwaighofer
* CREATED: 2001/07/11 * CREATED: 2001/07/11
* SHORT DESCRIPTION: * SHORT DESCRIPTION:
* sets the order from a table (edit_) * sets the order from a table (edit_)
* HISTORY: * HISTORY:
* 2005/07/11 (cs) adept to new edit interface * 2005/07/11 (cs) adept to new edit interface
* 2002-10-18: little include changes * 2002-10-18: little include changes
@@ -125,7 +125,7 @@
// get ... // get ...
$q = "SELECT ".$table_name."_id, name, order_number FROM ".$table_name." "; $q = "SELECT ".$table_name."_id, name, order_number FROM ".$table_name." ";
if ($where_string) if ($where_string)
$q .= "WHERE $where_string "; $q .= "WHERE $where_string ";
$q .= "ORDER BY order_number"; $q .= "ORDER BY order_number";
while ($res = $db->db_return($q)) while ($res = $db->db_return($q))

View File

@@ -261,7 +261,7 @@ $cms->debug('file_upload', "ERROR: $error | INI FSize: ".ini_get("upload_max_fil
$cms->db_exec($q); $cms->db_exec($q);
} }
} // if not error } // if not error
} }
if ($cms->action == 'delete' && $cms->action_yes == 'true') if ($cms->action == 'delete' && $cms->action_yes == 'true')
{ {
$file_uid = $cms->action_id; $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 // get th max entries
$q = "SELECT COUNT(file_uid) FROM file "; $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) 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))."%' "; $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'], 'size_y' => $res['size_y'],
'file_uid' => $res['file_uid'], 'file_uid' => $res['file_uid'],
'file_type' => $res['type'], '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 //------------------------------ footer
require("footer.inc"); require("footer.inc");
//------------------------------ footer //------------------------------ footer
?> ?>

View File

@@ -30,7 +30,7 @@
//------------------------------ library include end //------------------------------ library include end
//------------------------------ basic variable settings start //------------------------------ basic variable settings start
// set encoding // set encoding
if (!isset($encoding)) if (!isset($encoding))
$encoding = DEFAULT_ENCODING; $encoding = DEFAULT_ENCODING;
// set the default lang, if not given // set the default lang, if not given

View File

@@ -20,7 +20,7 @@
$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME; $MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
// just emergency fallback for language // just emergency fallback for language
// set encoding // set encoding
if ($_SESSION['DEFAULT_CHARSET']) if ($_SESSION['DEFAULT_CHARSET'])
$encoding = $_SESSION['DEFAULT_CHARSET']; $encoding = $_SESSION['DEFAULT_CHARSET'];
elseif (!$encoding) elseif (!$encoding)

View File

@@ -17,7 +17,7 @@
// set basic template path (tmp) // set basic template path (tmp)
// paths are set in the 'set_paths.inc' file // paths are set in the 'set_paths.inc' file
// check if we have an external file with the template name // 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)) if (file_exists($cms->includes.$cms->INC_TEMPLATE_NAME) && is_file($cms->includes.$cms->INC_TEMPLATE_NAME))
{ {

View File

@@ -12,12 +12,12 @@
DEFINE('EDIT_SESSION_NAME', "<ADMIN SESSION NAME>"); DEFINE('EDIT_SESSION_NAME', "<ADMIN SESSION NAME>");
// frontend // frontend
DEFINE('SESSION_NAME', "<SESSION NAME>"); DEFINE('SESSION_NAME', "<SESSION NAME>");
/************* LANGUAGE / ENCODING *******/ /************* LANGUAGE / ENCODING *******/
DEFINE('DEFAULT_LANG', "en_utf8"); DEFINE('DEFAULT_LANG', "en_utf8");
// default web page encoding setting // default web page encoding setting
DEFINE('DEFAULT_ENCODING', "UTF-8"); DEFINE('DEFAULT_ENCODING', "UTF-8");
/************* PATHS *********************/ /************* PATHS *********************/
// ** NEW/BETTER DIR DECLARATIONS ** // ** NEW/BETTER DIR DECLARATIONS **
// path to original file (if symlink) // path to original file (if symlink)
@@ -58,7 +58,7 @@
DEFINE('DOCUMENTS', "documents/"); DEFINE('DOCUMENTS', "documents/");
// files (pdfs) (below media) // files (pdfs) (below media)
DEFINE('PDFS', "documents/"); DEFINE('PDFS', "documents/");
// css // css
DEFINE('CSS', "css/"); DEFINE('CSS', "css/");
// js // js
DEFINE('JS', "javascript/"); DEFINE('JS', "javascript/");
@@ -123,7 +123,7 @@
DEFINE('USE_PROTOTYPE', true); DEFINE('USE_PROTOTYPE', true);
DEFINE('USE_SCRIPTACULOUS', false); DEFINE('USE_SCRIPTACULOUS', false);
DEFINE('USE_JQUERY', false); DEFINE('USE_JQUERY', false);
/************* LAYOUT WIDTHS *************/ /************* LAYOUT WIDTHS *************/
DEFINE('PAGE_WIDTH', 800); DEFINE('PAGE_WIDTH', 800);
// the default template name // the default template name
@@ -177,8 +177,8 @@
// show DEBUG override // show DEBUG override
// true/false // true/false
$DEBUG_FLAG['<host>'] = true; $DEBUG_FLAG['<host>'] = true;
// set postgresql paths (schemas) // set postgresql paths (schemas)
$DB_PATH['<host>'] = PUBLIC_SCHEMA; $DB_PATH['<host>'] = PUBLIC_SCHEMA;
// set the USE_DATABASE var, if there is nothing set, we assume TRUE // set the USE_DATABASE var, if there is nothing set, we assume TRUE
$USE_DATABASE = defined('USE_DATABASE') ? USE_DATABASE : true; $USE_DATABASE = defined('USE_DATABASE') ? USE_DATABASE : true;

View File

@@ -39,7 +39,7 @@ body
{ {
font-size : 9pt; font-size : 9pt;
font-family: Verdana,Arial,Helvetica,sans-serif; font-family: Verdana,Arial,Helvetica,sans-serif;
} }
.small .small
{ {
@@ -119,17 +119,17 @@ input[type="password"]
{ {
border: 1px solid #999999; border: 1px solid #999999;
} }
input[type="submit"] input[type="submit"]
{ {
border: 1px solid #666666; border: 1px solid #666666;
} }
input[type="checkbox"] input[type="checkbox"]
{ {
border: 1px solid #999999; border: 1px solid #999999;
} }
input[type="radio"] input[type="radio"]
{ {
border: 1px solid #999999; border: 1px solid #999999;
@@ -144,26 +144,26 @@ input[type="button"]
{ {
border: 1px solid #999999; border: 1px solid #999999;
} }
textarea textarea
{ {
border: 1px solid #999999; border: 1px solid #999999;
background-color: #efefef; background-color: #efefef;
} }
select select
{ {
border: 1px solid #999999; border: 1px solid #999999;
background-color: #efefef; 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 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; 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 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; border: 1px solid red;
@@ -505,7 +505,7 @@ div.spacer
} }
.edit_temp .edit_temp
{ {
background-color: #FFDF6F; background-color: #FFDF6F;
} }

View File

@@ -7,7 +7,7 @@
*/ */
var clientPC = navigator.userAgent.toLowerCase(); // Get client info var clientPC = navigator.userAgent.toLowerCase(); // Get client info
var is_gecko = ((clientPC.indexOf('gecko') != -1) && (clientPC.indexOf('spoofer') == -1) 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_safari = ((clientPC.indexOf('AppleWebKit') != -1) && (clientPC.indexOf('spoofer') == -1));
var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled )); var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled ));
if (clientPC.indexOf('opera') != -1) if (clientPC.indexOf('opera') != -1)
@@ -62,18 +62,18 @@ function expandTA(ta_id)
// DESC: shows or hides the menu // DESC: shows or hides the menu
function ShowHideMenu(status, id) function ShowHideMenu(status, id)
{ {
if (status == 'show') if (status == 'show')
{ {
document.getElementById(id).style.visibility = 'visible'; document.getElementById(id).style.visibility = 'visible';
if (document.getElementById('search_results').innerHTML) if (document.getElementById('search_results').innerHTML)
document.getElementById('search_results').style.visibility = 'visible'; document.getElementById('search_results').style.visibility = 'visible';
} }
else if (status == 'hide') else if (status == 'hide')
{ {
document.getElementById(id).style.visibility = 'hidden'; document.getElementById(id).style.visibility = 'hidden';
if (document.getElementById('search_results').style.visibility == 'visible') if (document.getElementById('search_results').style.visibility == 'visible')
document.getElementById('search_results').style.visibility = 'hidden'; document.getElementById('search_results').style.visibility = 'hidden';
} }
} }
function ShowHideDiv(id) function ShowHideDiv(id)
@@ -132,7 +132,7 @@ function getScrollOffset()
left = window.pageXOffset || (window.document.documentElement.scrollLeft || window.document.body.scrollLeft); left = window.pageXOffset || (window.document.documentElement.scrollLeft || window.document.body.scrollLeft);
top = window.pageYOffset || (window.document.documentElement.scrollTop || window.document.body.scrollTop); top = window.pageYOffset || (window.document.documentElement.scrollTop || window.document.body.scrollTop);
return {left: left, top: top}; return {left: left, top: top};
} }
// METHOD: setCenter // METHOD: setCenter
// PARAMS: id to set center // PARAMS: id to set center
@@ -153,9 +153,9 @@ function setCenter(id, left, top)
$(id).setStyle ({ $(id).setStyle ({
left: parseInt((viewport.width / 2) - (dimensions.width / 2) + offset.left) + 'px' left: parseInt((viewport.width / 2) - (dimensions.width / 2) + offset.left) + 'px'
}); });
} }
if (top) if (top)
{ {
$(id).setStyle ({ $(id).setStyle ({
top: parseInt((viewport.height / 2) - (dimensions.height / 2) + offset.top) + 'px' top: parseInt((viewport.height / 2) - (dimensions.height / 2) + offset.top) + 'px'
}); });

View File

@@ -1,5 +1,5 @@
/* vim: set fileencoding=utf-8 expandtab! shiftwidth=2 : */ /* 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 */ * firebug 1.2+ and the webkit console */
var ConsoleSetup = function() { var ConsoleSetup = function() {

View File

@@ -26,7 +26,7 @@
<table width="{$table_width}" border="0" cellpadding="0" cellspacing="1"> <table width="{$table_width}" border="0" cellpadding="0" cellspacing="1">
<!-- ERROR MSG START //--> <!-- ERROR MSG START //-->
{foreach from=$form_error_msg item=element key=key name=loop} {foreach from=$form_error_msg item=element key=key name=loop}
{include file="edit_error_msg.tpl"} {include file="edit_error_msg.tpl"}
{/foreach} {/foreach}
<!-- ERROR MSG END //--> <!-- ERROR MSG END //-->
<!-- TOP MENU START //--> <!-- TOP MENU START //-->

View File

@@ -24,11 +24,11 @@
{html_checkboxes values=$element.data.value output=$element.data.output selected=$element.data.checked} {html_checkboxes values=$element.data.value output=$element.data.output selected=$element.data.checked}
{/if} {/if}
{if $element.type == 'text'} {if $element.type == 'text'}
<input type="text" name="{$element.data.name}" value="{$element.data.value}"{if $element.data.size} size="{$element.data.size}"{/if}{if $element.data.length} maxlength="{$element.data.length}"{/if}> <input type="text" name="{$element.data.name}" value="{$element.data.value}"{if $element.data.size} size="{$element.data.size}"{/if}{if $element.data.length} maxlength="{$element.data.length}"{/if}>
{/if} {/if}
{if $element.type == 'password'} {if $element.type == 'password'}
Password: <input type="password" name="{$element.data.name}" {if $element.data.size} size="{$element.data.size}"{/if}{if $element.data.length} maxlength="{$element.data.length}"{/if}> {if $element.data.HIDDEN_value}{t}Password set{/t}{/if}<br> Password: <input type="password" name="{$element.data.name}" {if $element.data.size} size="{$element.data.size}"{/if}{if $element.data.length} maxlength="{$element.data.length}"{/if}> {if $element.data.HIDDEN_value}{t}Password set{/t}{/if}<br>
Confirm: <input type="password" name="CONFIRM_{$element.data.name}" {if $element.data.size} size="{$element.data.size}"{/if}{if $element.data.length} maxlength="{$element.data.length}"{/if}> Confirm: <input type="password" name="CONFIRM_{$element.data.name}" {if $element.data.size} size="{$element.data.size}"{/if}{if $element.data.length} maxlength="{$element.data.length}"{/if}>
<input type="hidden" name="HIDDEN_{$element.data.name}" value="{$element.data.HIDDEN_value}"> <input type="hidden" name="HIDDEN_{$element.data.name}" value="{$element.data.HIDDEN_value}">
{/if} {/if}
{if $element.type == 'date'} {if $element.type == 'date'}
@@ -71,7 +71,7 @@
<tr> <tr>
{* now each line of data *} {* now each line of data *}
<td> <td>
{$key}: {$key}:
</td> </td>
{foreach from=$line item=line_item key=line_key} {foreach from=$line item=line_item key=line_key}
<td> <td>

View File

@@ -52,7 +52,7 @@ var load_id = {if $primary_key}{$primary_key}{else}0{/if};
{/foreach} {/foreach}
</div> </div>
</div> </div>
<div style="float: left; margin: 2px; padding: 2px; position: relative; width: 570px; min-height: 450px;" class="{$status_color}"> <div style="float: left; margin: 2px; padding: 2px; position: relative; width: 570px; min-height: 450px;" class="{$status_color}">
{* START CONTENT *} {* START CONTENT *}
{include file="$CONTENT_INCLUDE"} {include file="$CONTENT_INCLUDE"}