[simpleinvoices commit] r1098 - in trunk: . include/ext2/grid templates/default templates/default/invoices

0 views
Skip to first unread message

codesite...@google.com

unread,
Oct 22, 2007, 9:20:12 AM10/22/07
to simpleinv...@googlegroups.com
Author: linuxppc
Date: Mon Oct 22 06:19:25 2007
New Revision: 1098

Modified:
trunk/include/ext2/grid/xml-grid.js
trunk/index.php
trunk/templates/default/header.tpl
trunk/templates/default/invoices/manage.tpl
trunk/templates/default/main.tpl

Log:
goodbye old layout :)

Modified: trunk/include/ext2/grid/xml-grid.js
==============================================================================
--- trunk/include/ext2/grid/xml-grid.js (original)
+++ trunk/include/ext2/grid/xml-grid.js Mon Oct 22 06:19:25 2007
@@ -32,14 +32,14 @@
ds.setDefaultSort('id', 'desc');

var cm = new Ext.grid.ColumnModel([
- {header: "ID", width: 120, dataIndex: 'id'},
+ {header: "ID", width: 50, dataIndex: 'id'},
{header: "Biller", width: 180, dataIndex: 'Biller'},
{header: "Customer", width: 115, dataIndex: 'Customer'},
- {header: "Total", width: 115, dataIndex: 'INV_TOTAL'},
- {header: "Paid", width: 115, dataIndex: 'INV_PAID'},
- {header: "Owing", width: 115, dataIndex: 'INV_OWING'},
- {header: "Date", width: 100, dataIndex: 'Date'},
- {header: "Aging", width: 100, dataIndex: 'Aging'},
+ {header: "Total", width: 75, dataIndex: 'INV_TOTAL'},
+ {header: "Paid", width: 75, dataIndex: 'INV_PAID'},
+ {header: "Owing", width: 75, dataIndex: 'INV_OWING'},
+ {header: "Date", width: 75, dataIndex: 'Date'},
+ {header: "Aging", width: 75, dataIndex: 'Aging'},
{header: "Type", width: 100, dataIndex: 'Type'}
]);
cm.defaultSortable = true;
@@ -49,21 +49,49 @@
ds: ds,
cm: cm,
title:'Manage Invoices',
+ //renderTo: document.body,
renderTo:'manageInvoicesGrid',
- width:800,
- height:600,
+ //width:800,
+ //height:600,
+ //autoHeight: true,
+ viewConfig: {
+ forceFit:true
+ },
+
bbar: new Ext.PagingToolbar({
pageSize: 25,
store: ds,
displayInfo: true,
displayMsg: 'Displaying invoices {0} - {1} of {2}'
- })
+ }),
+ layout:'fit',
+ tbar:[{
+ text:'Add New Invoice',
+ tooltip:'Add a new row',
+ iconCls:'add'
+ }, '-', {
+ text:'New Consulting style invoice',
+ tooltip:'Blah blah blah blaht',
+ iconCls:'option'
+ },'-',{
+ text:'new Itemised style invoice',
+ tooltip:'Remove the selected item',
+ iconCls:'remove'
+ }]

});

+pnl = new Ext.Viewport( {
+ id:'panel',
+ frame:false,
+ layout:'fit',
+ items:grid
+});
+
+

- ds.load({params:{start:0, limit:25}});
+ ds.load({params:{start:0, limit:25}});

//ds.load();
});

Modified: trunk/index.php
==============================================================================
--- trunk/index.php (original)
+++ trunk/index.php Mon Oct 22 06:19:25 2007
@@ -121,7 +121,8 @@

//$smarty -> display("../templates/default/menu.tpl");

-$smarty -> display("../templates/default/main.tpl");
+//old main file no longer needed
+//$smarty -> display("../templates/default/main.tpl");
//Shouldn't be necessary anymore. Ist for old files without tempaltes...

if(file_exists("./templates/default/$file.tpl")) {
@@ -135,7 +136,8 @@
error_log("NOTEMPLATE!!!");
}

-$smarty -> display("../templates/default/footer.tpl");
+// not needed
+//$smarty -> display("../templates/default/footer.tpl");


?>

Modified: trunk/templates/default/header.tpl
==============================================================================
--- trunk/templates/default/header.tpl (original)
+++ trunk/templates/default/header.tpl Mon Oct 22 06:19:25 2007
@@ -4,75 +4,14 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<title>Simple Invoices</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <script type="text/javascript">
- var GB_ROOT_DIR = "modules/include/js/";
- </script>
- <link rel="stylesheet" type="text/css"
href="templates/default/css/menu_header.css" media="screen" />
- <link rel="stylesheet" type="text/css"
href="templates/default/css/screen.css" media="all"/>
- <link rel="stylesheet" type="text/css"
href="templates/default/css/print.css" media="print"/>
- <script type="text/javascript" src="include/tiny_mce/tiny_mce_src.js"></script>
- <script type="text/javascript" src="include/tiny-mce.conf.js"></script>
-
- <!-- jQuery Files -->
- <script type="text/javascript" src="include/jquery/jquery.js"></script>
- <script type="text/javascript" src="include/jquery/jquery.plugins.js"></script>
- <script type="text/javascript" src="include/jquery/jquery.conf.js"></script>
- <link rel="stylesheet" type="text/css"
href="include/jquery/jquery.plugins.css" title="default" media="screen" />
-
- <!-- extJs Files
- <script type="text/javascript" src="include/ext/ext-jquery-adapter.js"></script>
- <script type="text/javascript" src="include/ext/ext-all.js"></script>
- <script type="text/javascript" src="include/ext/ext.extensions.js"></script>
- <script type="text/javascript" src="include/ext/ext.conf.js"></script>
- <link rel="stylesheet" type="text/css" href="include/ext/grid.css"
title="default" media="screen" />
- -->
+ <head>
<!-- extJs2 Files -->
<link rel="stylesheet" type="text/css"
href="./include/ext2/resources/css/ext-all.css" />
<script type="text/javascript" src="./include/ext2/adapter/ext/ext-base.js"></script>
<script type="text/javascript" src="./include/ext2/ext-all.js"></script>
<script type="text/javascript" src="./include/ext2/grid/xml-grid.js"></script>
<link rel="stylesheet" type="text/css"
href="./include/ext2/grid/grid-examples.css" />
- <!--
- <link rel="stylesheet" type="text/css"
href="./include/ext2/examples.css" />
- -->
-
-
-
-
-
-<!-- <script type="text/javascript"
src="include/ext/ext.js"></script> -->
-{literal}
- <!-- Menu header -->
- <!--[if lte IE 6]>
- <link rel="stylesheet" type="text/css"
href="templates/default/css/menu_header_hackIE.css" media="screen" />
- <script type="text/javascript" src="templates/default/js/ADxMenu.js"></script>
- <![endif]-->
-
-
- <!-- Additional IE/Win specific style sheet (Conditional Comments) -->
- <!--[if IE 7]>
- <link rel="stylesheet" type="text/css"
href="templates/default/css/menu_header_hackIE.css" media="screen" />
- <link rel="stylesheet" href="temlates/default/css/tabs-ie.css"
type="text/css" media="projection, screen" />
- <![endif]-->
-
- <!-- Additional IE/Win specific style sheet (Conditional Comments) -->
- <!--[if lte IE 7]>
- <style type="text/css" media="screen, projection">
- body {
- font-size: 100%; /* resizable fonts */
- }
- </style>
- <![endif]-->

-{/literal}
- <!-- customer-details -->
- <link rel="stylesheet" href="templates/default/css/tabs.css"
type="text/css" media="print, projection, screen" />
- <script type="text/javascript" src="modules/include/js/AJS.js"></script>
- <script type="text/javascript" src="modules/include/js/AJS_fx.js"></script>
- <script type="text/javascript" src="modules/include/js/gb_scripts.js"></script>
- <link href="templates/default/css/gb_styles.css" rel="stylesheet"
type="text/css" />
-<!--[if gte IE 5.5]>
- <script language="JavaScript" src="modules/include/js/dhtml.js" type="text/JavaScript"></script>
- <link rel="stylesheet" href="templates/default/css/iehacks.css"
type="text/css" />
-<![endif]-->
+ <link rel="stylesheet" type="text/css"
href="./include/css/simpleInvoicesStyle.css" />
+</head>
<body>

Modified: trunk/templates/default/invoices/manage.tpl
==============================================================================
--- trunk/templates/default/invoices/manage.tpl (original)
+++ trunk/templates/default/invoices/manage.tpl Mon Oct 22 06:19:25 2007
@@ -20,10 +20,12 @@
{if $invoices == null }
<p><em>{$LANG.no_invoices}.</em></p>
{else}
+{*
<div style="text-align:center;"><b>{$LANG.manage_invoices}</b> :: <a
href="index.php?module=invoices&view=total">{$LANG.add_new_invoice} -
{$LANG.total_style}</a> :: <a
href="index.php?module=invoices&view=itemised">{$LANG.add_new_invoice}
- {$LANG.itemised_style}</a> :: <a
href="index.php?module=invoices&view=consulting">{$LANG.add_new_invoice}
- {$LANG.consulting_style}</a></div><hr />
+*}

<div id="manageInvoicesGrid"></div>
-
+{*
<div style="text-align:center;"><b>{$LANG.manage_invoices}</b> :: <a
href="index.php?module=invoices&view=total">{$LANG.add_new_invoice} -
{$LANG.total_style}</a> :: <a
href="index.php?module=invoices&view=itemised">{$LANG.add_new_invoice}
- {$LANG.itemised_style}</a> :: <a
href="index.php?module=invoices&view=consulting">{$LANG.add_new_invoice}
- {$LANG.consulting_style}</a></div><hr />
<table width="95%" border="0" cellspacing="0" cellpadding="0"
align="center" class="manage" id="live-grid">
<colgroup>
@@ -95,5 +97,7 @@
{/foreach}
</tbody>
</table>
+
+*}

{/if}

Modified: trunk/templates/default/main.tpl
==============================================================================
--- trunk/templates/default/main.tpl (original)
+++ trunk/templates/default/main.tpl Mon Oct 22 06:19:25 2007
@@ -1,4 +1,6 @@
-
+<!--
+TODO : delet this file
+-->

<div id="Container">

Reply all
Reply to author
Forward
0 new messages