[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[5933] trunk/UI/Contact



Revision: 5933
          http://sourceforge.net/p/ledger-smb/code/5933
Author:   freelock
Date:     2013-08-03 16:11:27 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Move Contact screen to work with dojo tabs

Modified Paths:
--------------
    trunk/UI/Contact/contact.html
    trunk/UI/Contact/divs/address.html
    trunk/UI/Contact/divs/bank_act.html
    trunk/UI/Contact/divs/company.html
    trunk/UI/Contact/divs/contact_info.html
    trunk/UI/Contact/divs/credit.html
    trunk/UI/Contact/divs/files.html
    trunk/UI/Contact/divs/notes.html

Added Paths:
-----------
    trunk/UI/Contact/tabs.js

Modified: trunk/UI/Contact/contact.html
===================================================================
--- trunk/UI/Contact/contact.html	2013-08-03 16:11:15 UTC (rev 5932)
+++ trunk/UI/Contact/contact.html	2013-08-03 16:11:27 UTC (rev 5933)
@@ -2,10 +2,12 @@
  INCLUDE 'ui-header.html'
         stylesheet = USER.stylesheet
 	include_stylesheet = [
+		'UI/lib/dojo/dijit/themes/claro/claro.css',
+	        'UI/lib/dojo/dojo/resources/dojo.css',
 		'UI/Contact/contact.css'
 	] 
-	include_script = [
-		'UI/Contact/contact.js'
+	include_dojo = [
+		'lsmb/Contact/tabs'
 	]
 ?>
 <?lsmb PROCESS 'elements.html';
@@ -14,7 +16,7 @@
 <?lsmb IF !country_id_t; country_id_t = default_country; END -?>
 <?lsmb  # Target_div handling now moved to controller script -- CT -?>
 
-<body onload="init('<?lsmb request.target_div ?>')">
+<body class="claro">
     <?lsmb IF name ?> 
 <div class="pageheading"><?lsmb text('Company') ?>: <?lsmb name ?></div>
     <?lsmb END ?>
@@ -37,18 +39,13 @@
 <?lsmb text("Add Employee") ?>
 <?lsmb text("Edit Employee") ?>
 -->
-<ul class="navigation">
-        <?lsmb FOREACH nav IN DIVS ?>
-         <li class="nav"><a href="#<?lsmb nav ?>_div"><?lsmb DIV_LABEL.$nav 
-          ?></a></li>
-        <?lsmb  END ?>
-</ul>
 </div>
-
+<div data-dojo-type="dijit/layout/TabContainer" style="height:500px;">
   <?lsmb FOREACH ITEM IN DIVS; 
       INCLUDEDIV = "divs/" _ ITEM _ ".html";
       INCLUDE $INCLUDEDIV;
   END 
-?>
+  ?>
+</div>
 </body>
 </html>

Modified: trunk/UI/Contact/divs/address.html
===================================================================
--- trunk/UI/Contact/divs/address.html	2013-08-03 16:11:15 UTC (rev 5932)
+++ trunk/UI/Contact/divs/address.html	2013-08-03 16:11:27 UTC (rev 5933)
@@ -1,4 +1,4 @@
-<div id="address_div" class="container">
+<div id="address_div" data-dojo-type="dijit/layout/ContentPane" title="<?lsmb text('Addresses') ?>" class="container">
     <div class="listtop"><?lsmb text('Locations') ?></div>
 	<!-- This entire form should probably be optionaly automated with AJAX
 	in order to prevent user confusion -CT -->

Modified: trunk/UI/Contact/divs/bank_act.html
===================================================================
--- trunk/UI/Contact/divs/bank_act.html	2013-08-03 16:11:15 UTC (rev 5932)
+++ trunk/UI/Contact/divs/bank_act.html	2013-08-03 16:11:27 UTC (rev 5933)
@@ -1,4 +1,4 @@
-<div class="container" id="bank_act_div">
+<div class="container" id="bank_act_div" data-dojo-type="dijit/layout/ContentPane" title="<?lsmb text('Bank Accounts') ?>">
 <div class="listtop"><?lsmb text('Bank Accounts') ?></div>
 <?lsmb 
 href_base = script _ '?&entity_id=' _ entity_id _ '&target_div=bank_act_div' _

Modified: trunk/UI/Contact/divs/company.html
===================================================================
--- trunk/UI/Contact/divs/company.html	2013-08-03 16:11:15 UTC (rev 5932)
+++ trunk/UI/Contact/divs/company.html	2013-08-03 16:11:27 UTC (rev 5933)
@@ -1,4 +1,4 @@
-<div class="container" id="company_div">
+<div class="container" id="company_div" data-dojo-type="dijit/layout/ContentPane" title="<?lsmb text('Company') ?>">
 <?lsmb SWITCH entity_class
 	?><?lsmb CASE 1 ?><?lsmb entity_classname = "Vendor" 
 	?><?lsmb CASE 2 ?><?lsmb entity_classname = "Customer" 

Modified: trunk/UI/Contact/divs/contact_info.html
===================================================================
--- trunk/UI/Contact/divs/contact_info.html	2013-08-03 16:11:15 UTC (rev 5932)
+++ trunk/UI/Contact/divs/contact_info.html	2013-08-03 16:11:27 UTC (rev 5933)
@@ -1,4 +1,4 @@
-<div class="container" id="contact_info_div">
+<div class="container" id="contact_info_div" data-dojo-type="dijit/layout/ContentPane" title="<?lsmb text('Contact Info') ?>">
 <div class="listtop"><?lsmb text('Contact Information') ?></div>
 <?lsmb 
 

Modified: trunk/UI/Contact/divs/credit.html
===================================================================
--- trunk/UI/Contact/divs/credit.html	2013-08-03 16:11:15 UTC (rev 5932)
+++ trunk/UI/Contact/divs/credit.html	2013-08-03 16:11:27 UTC (rev 5933)
@@ -1,4 +1,4 @@
-<div id="credit_div" class="container">
+<div id="credit_div" class="container" data-dojo-type="dijit/layout/ContentPane" title="<?lsmb text('Credit Accounts') ?>">
 <div class="listtop"><strong>Accounts</strong></div>
 <?lsmb 
 

Modified: trunk/UI/Contact/divs/files.html
===================================================================
--- trunk/UI/Contact/divs/files.html	2013-08-03 16:11:15 UTC (rev 5932)
+++ trunk/UI/Contact/divs/files.html	2013-08-03 16:11:27 UTC (rev 5933)
@@ -1,4 +1,4 @@
-<div class="container" id="files_div">
+<div class="container" id="files_div" data-dojo-type="dijit/layout/ContentPane" title="<?lsmb text('Files') ?>">
 <?lsmb callback="contact.pl?action=get&entity_class=" _ 
                 credit_act.entity_class _ "&entity_id=" _ entity_id _
                 "&credit_id=" _ credit_act.id; 

Modified: trunk/UI/Contact/divs/notes.html
===================================================================
--- trunk/UI/Contact/divs/notes.html	2013-08-03 16:11:15 UTC (rev 5932)
+++ trunk/UI/Contact/divs/notes.html	2013-08-03 16:11:27 UTC (rev 5933)
@@ -1,4 +1,4 @@
-<div id="notes_div" class="container">
+<div id="notes_div" class="container" data-dojo-type="dijit/layout/ContentPane" title="<?lsmb text('Notes') ?>">
 <div class="listtop"><?lsmb text('Notes') ?></div>
 <form action="<?lsmb script ?>" method="post">
 <?lsmb PROCESS input element_data = {

Added: trunk/UI/Contact/tabs.js
===================================================================
--- trunk/UI/Contact/tabs.js	                        (rev 0)
+++ trunk/UI/Contact/tabs.js	2013-08-03 16:11:27 UTC (rev 5933)
@@ -0,0 +1,9 @@
+define(['dijit/layout/TabContainer', 'dijit/layout/ContentPane', 'dojo/parser'],
+    function(TabContainer, ContentPane, Parser) {
+      return {
+        init: function(){
+          Parser.parse();
+        }
+      };
+    }
+    );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.