deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

OSB enhancements to date

Browse Source
This commit is contained in:
Deon George
2010-11-30 09:41:08 +11:00
parent 8715a2059b
commit ec6a542bc3
478 changed files with 23423 additions and 9309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
themes/default_admin/blocks/core/admin.tpl
View File

@@ -33,62 +33,92 @@
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="3">
<tr valign="middle" align="center" class="table_heading">
<td width="25%" class="table_heading">{t}Indicator{/t}</td>
<td width="30%" class="table_heading">{t}Period{/t}</td>
<td width="15%" class="table_heading"><b>{t}Current{/t}</b></td>
<td width="15%" class="table_heading">{t}Previous{/t}</td>
<td width="15%" class="table_heading"><b>{t}Change{/t}</b></td>
<td style="width: 25%;" class="table_heading">{t}Indicator{/t}</td>
<td style="width: 30%;" class="table_heading">{t}Period{/t}</td>
<td style="width: 15%;" class="table_heading"><b>{t}Current{/t}</b></td>
<td style="width: 15%;" class="table_heading">{t}Previous{/t}</td>
<td style="width: 15%;" class="table_heading"><b>{t}Change{/t}</b></td>
</tr>
<tr class="row1">
<td width="214" bgcolor="#ECFAEB"><b>{t}Sales{/t}</b></td>
<td width="273">{$period_compare}</td>
<td width="358"><b>{$list->format_currency_num($sales_current,'')}</b></td>
<td width="330">{$list->format_currency_num($sales_previous,'')}</td>
<td width="173" align="center">{$sales_change}</td>
<tr class="row{cycle values="1,2"}">
<td style="background: #ECFAEB;"><b>{t}Sales{/t}</b></td>
<td>{$period_compare}</td>
<td><b>{$list->format_currency_num($sales_current)}</b></td>
<td>{$list->format_currency_num($sales_previous)}</td>
<td style="text-align: center;">
{if $sales_change < 0}
<font color="#990000">{$sales_change|number_format:2}%</font>
{else}
+{$sales_change|number_format:2}%
{/if}
</td>
</tr>
<tr class="row2">
<td width="214" bgcolor="#ECFAEB"><b>{t}Forcast{/t}</b></td>
<td width="273">{$period_forcast}</td>
<td width="358"><b>{$list->format_currency_num($forcast_current,'')}</b></td>
<td width="330">-</td>
<td width="173" align="center">{$forcast_change}</td>
<tr class="row{cycle}">
<td style="background: #ECFAEB;"><b>{t}Forcast{/t}</b></td>
<td>{$period_forcast}</td>
<td><b>{$list->format_currency_num($forcast_current)}</b></td>
<td>-</td>
<td style="text-align: center;">
{if $forcast_change < 0}
<font color="#990000">{$forcast_change|number_format:2}%</font>
{else}
+{$forcast_change|number_format:2}%
{/if}
</td>
</tr>
<tr class="row1">
<td width="214" bgcolor="#ECFAEB"><b>{t}Quota{/t}</b></td>
<td width="273">{t}Today{/t}</td>
<td width="358"><b>{$list->format_currency_num($quota_current,'')}</b></td>
<td width="330">-</td>
<td width="173" align="center"><b>-</b></td>
<tr class="row{cycle}">
<td style="background: #ECFAEB;"><b>{t}Quota{/t}</b></td>
<td>{t}Today{/t}</td>
<td><b>{$list->format_currency_num($quota_current)}</b></td>
<td>-</td>
<td style="text-align: center;"><b>-</b></td>
</tr>
<tr class="row2">
<td width="214" bgcolor="#ECFAEB"><b>{t}A/R Credits{/t}</b></td>
<td width="273">{$period_compare}</td>
<td width="358"><b>{$list->format_currency_num($ar_credits_current,'')}</b></td>
<td width="330">{$list->format_currency_num($ar_credits_previous,'')}</td>
<td width="173" align="center">{$ar_credit_change}</td>
<tr class="row{cycle}">
<td style="background: #ECFAEB;"><b>{t}A/R Credits{/t}</b></td>
<td>{$period_compare}</td>
<td><b>{$list->format_currency_num($ar_credits_current)}</b></td>
<td>{$list->format_currency_num($ar_credits_previous)}</td>
<td style="text-align: center;">
{if $ar_credit_change < 0}
<font color="#990000">{$ar_credit_change|number_format:2}%</font>
{else}
+{$ar_credit_change|number_format:2}%
{/if}
</td>
</tr>
<tr class="row1">
<td width="214" bgcolor="#ECFAEB"><b>{t}A/R Balance{/t}</b></td>
<td width="273">{$period_compare}</td>
<td width="358"><b>{$list->format_currency_num($ar_balance_current,'')}</b></td>
<td width="330">{$list->format_currency_num($ar_balance_last,'')}</td>
<td width="173" align="center"><b>-</b></td>
<tr class="row{cycle}">
<td style="background: #ECFAEB;"><b>{t}A/R Balance{/t}</b></td>
<td>{$period_compare}</td>
<td><b>{$list->format_currency_num($ar_balance_current)}</b></td>
<td>{$list->format_currency_num($ar_balance_last)}</td>
<td style="text-align: center;"><b>-</b></td>
</tr>
<tr class="row2">
<td width="214" bgcolor="#ECFAEB"><b>{t}Users{/t}</b></td>
<td width="273">{$period_compare}</td>
<td width="358"><b>{$users_current}</b></td>
<td width="330">{$users_previous}</td>
<td width="173" align="center">{$users_change}</td>
<tr class="row{cycle}">
<td style="background: #ECFAEB;"><b>{t}Users{/t}</b></td>
<td>{$period_compare}</td>
<td><b>{$users_current}</b></td>
<td>{$users_previous}</td>
<td style="text-align: center;">
{if $users_change < 0}
<font color="#990000">{$users_change|number_format:2}%</font>
{else}
+{$users_change|number_format:2}%
{/if}
</td>
</tr>
<!-- @todo this test should be is-installed, and show_affliates from the affliate config, not the core config -->
{if $show_affiliates == true}
<tr class="row2">
<td width="214" bgcolor="#ECFAEB"><b>{t module=invoice}affiliatesales{/t}</b></td>
<td width="273">{$period_compare}</td>
<td width="358"><b>{$list->format_currency_num($affiliate_sales_current,'')}</b></td>
<td width="330">{$list->format_currency_num($affiliate_sales_previous,'')}</td>
<td width="173" align="center">{$affiliate_sales_change}</td>
<tr class="row{cycle}">
<td style="background: #ECFAEB;"><b>{t module=invoice}affiliatesales{/t}</b></td>
<td>{$period_compare}</td>
<td><b>{$list->format_currency_num($affiliate_sales_current)}</b></td>
<td>{$list->format_currency_num($affiliate_sales_previous)}</td>
<td style="text-align: center;">
{if $affiliate_sales_change < 0}
<font color="#990000">{$affiliate_sales_change|number_format:2}%</font>
{else}
+{$affiliate_sales_change|number_format:2}%
{/if}
</td>
</tr>
{/if}
</table>

1
themes/default_admin/blocks/core/invalid_page.tpl
View File

@@ -1 +0,0 @@
<BR><BR><center>Sorry, the page you specified does not exist on our server!</center>

12
themes/default_admin/blocks/core/leftFrameBlue.tpl
View File

@@ -49,6 +49,7 @@
<dt>all</dt><dd>Show ALL accounts</dd>
<dt>fn:XXX</dt><dd>Show accounts where FIRST NAME is XXX</dd>
<dt>ln:XXX</dt><dd>Show accounts where LAST NAME is XXX</dd>
<dt>un:XXX</dt><dd>Show accounts where USERNAME is XXX</dd>
<dt>co:XXX</dt><dd>Show accounts where COMPANY NAME is XXX</dd>
<dt>em:XXX</dt><dd>Show accounts where EMAIL is XXX</dd>
<dt>id:XXX</dt><dd>Show accounts where ID is XXX</dd>
@@ -136,11 +137,11 @@ All Rights Reserved.
} else if(s.match(/em:/)) {
var str = s.replace(/em:/, "");
st += '&account_email='+str;
} else if(s.match(/id:/)) {
} else if(s.match(/un:/)) {
var str = s.replace(/id:/, "");
st += '&account_id='+str;
st += '&account_username='+str;
} else {
st += '&account_username=' +s;
st += '&account_id=' +s;
}
} else {
var array=input.split(" ");
@@ -163,6 +164,9 @@ All Rights Reserved.
} else if(s.match(/ln:/)) {
var str = s.replace(/ln:/, "");
st += '&account_last_name='+str;
} else if(s.match(/un:/)) {
var str = s.replace(/un:/, "");
st += '&account_username='+str;
} else if(s.match(/co:/)) {
var str = s.replace(/co:/, "");
st += '&account_company='+str;
@@ -170,7 +174,7 @@ All Rights Reserved.
var str = s.replace(/em:/, "");
st += '&account_email='+str;
} else {
st += '&account_username=' +s;
st += '&account_id=' +s;
}
num+=1;
}

1
themes/default_admin/blocks/core/top_frame.tpl
View File

@@ -23,6 +23,7 @@
{/literal}
//-->
</script>
<script type="text/javascript" src="/osb/media/js/jquery-1.4.2.js"></script>
<!-- Load the main stylesheet -->
<link rel="stylesheet" href="themes/{$THEME_NAME}/style.css" type="text/css"/>

11
themes/default_admin/search.js
View File

@@ -12,10 +12,6 @@ function search_nav_jump(jmp_to) {
}
}
function search_nav_jump1(jmp_to) {
search_nav_jump(jmp_to);
}
function search_nav_top() {
var iPages = (new Number(pages)) + 0;
var iPage = (new Number(page)) + 0;
@@ -96,7 +92,7 @@ function search_heading(title,field) {
newimg = '';
}
var url = '?_page='+module+':search_show&search_id='+search_id+'&page='+page+'&'+newsort+'=&order_by='+field+''+p+pgescape;
var url = '?_page='+module+':'+method+'&search_id='+search_id+'&page='+page+'&'+newsort+'=&order_by='+field+''+p+pgescape;
if (newimg)
var returns = '<a href="'+url+'" class="table_heading_txt"><u>'+title+'</u> <img src="themes/' + THEME_NAME + '/images/db_'+newimg+'" border="0"></a>';
@@ -206,12 +202,13 @@ function mass_do(doit, page, limit, module) {
var checked = document.getElementById("record"+record_arr[i]).checked;
var this_id = document.getElementById("record"+record_arr[i]).value;
if(checked != '') {
if (checked != '') {
count++;
id = id + this_id + ',';
}
}
}
id = id.replace(/,$/,'');
if(count == 0) {
alert('You must first select some records for this action!');
@@ -275,7 +272,7 @@ function key_handler(e) {
}
if(pressed == 'x' || pressed == 'X') {
mass_do('delete', module+ ":search_show&search_id=" +search_id+ "&page=" +page+ "&order_by=" +order+ "&" +sort1, limit, module);
mass_do('delete', module+':'+method+'&search_id='+search_id+'&page='+page+'&order_by='+order+'&'+sort1,limit,module);
}
if(pressed == 'v' || pressed == 'V') {

6
themes/default_admin/view-advanced.js
View File

@@ -26,7 +26,7 @@ function view_Jump(account_id) {
if (module != 'invoice')
break;
approveInvoice(id,1,ids)
pApproveVoid(id,1)
break;
case 'become':
@@ -58,7 +58,7 @@ function view_Jump(account_id) {
if (module != 'account')
break;
document.location = URL+'admin.php?_page='+module+':view&do[]=invoice:generateinvoice_account&account_id='+account_id+'&id='+account_id;
document.location = URL+'admin.php?_page='+module+':view&do[]=invoice:generateinvoice_account&account_id='+account_id+'&id='+account_id+'&_page_current='+module+':view';
break;
case 'merge':
@@ -142,7 +142,7 @@ function view_Jump(account_id) {
if (module != 'invoice')
break;
approveInvoice(id,0,ids)
pApproveVoid(id,0)
break;
default:

2
themes/default_admin/view.js
View File

@@ -20,7 +20,7 @@ function view_nav_top(array,id,ids) {
var ff = '';
var jmp= '';
var t=array.length-1;
var t=array.length;
var last = false;
var next = false;