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

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



Revision: 6050
          http://sourceforge.net/p/ledger-smb/code/6050
Author:   einhverfr
Date:     2013-09-18 11:11:47 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
Javascript fixes to initialization logic, some element id conflicts resolved, company div moved to tabular format as example

Modified Paths:
--------------
    trunk/UI/Contact/contact.js
    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/employee.html
    trunk/UI/Contact/divs/files.html
    trunk/UI/Contact/divs/notes.html
    trunk/UI/Contact/divs/person.html
    trunk/UI/Contact/divs/user.html
    trunk/UI/Contact/divs/wage.html

Modified: trunk/UI/Contact/contact.js
===================================================================
--- trunk/UI/Contact/contact.js	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/contact.js	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-require(['dojo/parser', 
+require([
          'dojo/query', 
          'dojo/dom', 
          "dijit/layout/TabContainer",
@@ -6,12 +6,9 @@
          'lsmb/Contact/tabs',
           'dijit/registry',
          'dojo/ready'],
-       function(parser, query, dom, tc, cp, obj, registry){
-           parser.instantiate([dom.byId('contact_tabs')], 
-              { "data-dojo-type": "dijit/layout/TabContainer" }
-           );
-           var tabs = registry.byId('contact_tabs');
-           query('.container').forEach(function(cnode){
+       function(query, dom, tc, cp, obj, registry){
+           var tabs = new tc({}, dom.byId('contact_tabs'));
+           query('div.lsmbtab').forEach(function(cnode){
                new cp (
                    { "data-dojo-type": 'dijit.layout.ContentPane',
                      "title": cnode.title},
@@ -28,15 +25,3 @@
  
 );
 
-
-require([
-	'lsmb/Contact/tabs',
-	'dojo/parser',
-	'dojo/ready'], 
-	function(
-		  obj,
-		  parser){
-		}
-);
-
-

Modified: trunk/UI/Contact/divs/address.html
===================================================================
--- trunk/UI/Contact/divs/address.html	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/address.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div id="address_div" title="<?lsmb text('Addresses') ?>" class="container">
+<div id="address_div" title="<?lsmb text('Addresses') ?>" class="lsmbtab">
     <div class="listtop"><?lsmb text('Locations') ?></div>
 	<!-- This entire form should probably be optionaly automated with AJAX
 	in order to prevent user confusion -CT -->
@@ -90,6 +90,7 @@
              <?lsmb IF credit_act.id;
                        INCLUDE select element_data = {
                           name            = "attach_to"
+                          id              = 'attach_address_to' 
                           default_options = ['3']
                           options         = attach_level_options
                           label           = text('Attach To') #'

Modified: trunk/UI/Contact/divs/bank_act.html
===================================================================
--- trunk/UI/Contact/divs/bank_act.html	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/bank_act.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div class="container" id="bank_act_div" title="<?lsmb text('Bank Accounts') ?>">
+<div class="lsmbtab" id="bank_act_div" 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-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/company.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div class="container" id="company_div" title="<?lsmb text('Company') ?>">
+<div class="lsmbtab" id="company_div" title="<?lsmb text('Company') ?>">
 <?lsmb SWITCH entity_class
 	?><?lsmb CASE 1 ?><?lsmb entity_classname = "Vendor" 
 	?><?lsmb CASE 2 ?><?lsmb entity_classname = "Customer" 
@@ -35,6 +35,7 @@
 		name = "account_class"
 		value = account_class
 	} ?>	
+<div class="tabular col-2">
 <div class="input_line">
 <div class="input_group1">
 	<?lsmb PROCESS input element_data = {
@@ -63,22 +64,6 @@
 		value_attr = 'id'
 		label = text('Class')
 	} ?>
-	<?lsmb PROCESS button element_data = {
-		text = text('Generate Control Code') #'
-                  id = 'company-generate-control-code'
-		type = "submit"
-		name = "action"
-		value = "generate_control_code"
-		class = "submit"
-        } ?>
-        <?lsmb PROCESS button element_data = {
-                  id = 'company-action-retireve'
-                text = text('Retrieve')
-                type = 'submit'
-                name = 'action'
-               value = 'get_by_cc'
-               class = 'submit'
-        } ?>
 </div>
 </div>
 <div class="input_line">
@@ -151,9 +136,26 @@
      } ?>
 </div>
 </div>
+</div>
 <div class="input_line">
             <hr/>
 <div class="input_group1">
+	<?lsmb PROCESS button element_data = {
+		text = text('Generate Control Code') #'
+                  id = 'company-generate-control-code'
+		type = "submit"
+		name = "action"
+		value = "generate_control_code"
+		class = "submit"
+        } ?>
+        <?lsmb PROCESS button element_data = {
+                  id = 'company-action-retireve'
+                text = text('Retrieve')
+                type = 'submit'
+                name = 'action'
+               value = 'get_by_cc'
+               class = 'submit'
+        } ?>
 		<?lsmb INCLUDE button element_data = {
 			text = text('Save'),
 			class="submit" 

Modified: trunk/UI/Contact/divs/contact_info.html
===================================================================
--- trunk/UI/Contact/divs/contact_info.html	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/contact_info.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div class="container" id="contact_info_div" title="<?lsmb text('Contact Info') ?>">
+<div class="lsmbtab" id="contact_info_div" title="<?lsmb text('Contact Info') ?>">
 <div class="listtop"><?lsmb text('Contact Information') ?></div>
 <?lsmb 
 
@@ -68,6 +68,7 @@
              <?lsmb IF credit_act.id;
                        INCLUDE select element_data = {
                           name            = "attach_to"
+                          id              = 'attach_contact_to'
                           default_options = ['3']
                           options         = attach_level_options
                           label           = text('Attach To') #'
@@ -89,6 +90,7 @@
 		<?lsmb PROCESS input element_data = {
 			label = text('Description'),
 			name = "description"
+                        id   = 'contact_description'
 			value = request.description
 			type = "text"
 			size = "20"

Modified: trunk/UI/Contact/divs/credit.html
===================================================================
--- trunk/UI/Contact/divs/credit.html	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/credit.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div id="credit_div" class="container" title="<?lsmb text('Credit Accounts') ?>">
+<div id="credit_div" class="lsmbtab" title="<?lsmb text('Credit Accounts') ?>">
 <div class="listtop"><strong>Accounts</strong></div>
 <?lsmb 
 

Modified: trunk/UI/Contact/divs/employee.html
===================================================================
--- trunk/UI/Contact/divs/employee.html	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/employee.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div id="employee_div" class="container"  title="<?lsmb text('Employee') ?>">
+<div id="employee_div" class="lsmbtab"  title="<?lsmb text('Employee') ?>">
 	<div class="listtop"><strong><?lsmb text("$operation Employee") ?></strong></div>
 <form name="hr" action="<?lsmb script ?>" method="post">
 <?lsmb PROCESS input element_data = {

Modified: trunk/UI/Contact/divs/files.html
===================================================================
--- trunk/UI/Contact/divs/files.html	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/files.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div class="container" id="files_div" title="<?lsmb text('Files') ?>">
+<div class="lsmbtab" id="files_div" 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-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/notes.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div id="notes_div" class="container" title="<?lsmb text('Notes') ?>">
+<div id="notes_div" class="lsmbtab" title="<?lsmb text('Notes') ?>">
 <div class="listtop"><?lsmb text('Notes') ?></div>
 <form action="<?lsmb script ?>" method="post">
 <?lsmb PROCESS input element_data = {

Modified: trunk/UI/Contact/divs/person.html
===================================================================
--- trunk/UI/Contact/divs/person.html	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/person.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div class="container" id="person_div" title="<?lsmb text('Person') ?>">
+<div class="lsmbtab" id="person_div" title="<?lsmb text('Person') ?>">
 <?lsmb SWITCH entity_class
 	?><?lsmb CASE 1 ?><?lsmb entity_classname = "Vendor" 
 	?><?lsmb CASE 2 ?><?lsmb entity_classname = "Customer" 

Modified: trunk/UI/Contact/divs/user.html
===================================================================
--- trunk/UI/Contact/divs/user.html	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/user.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div id="user_div" class="container"  title="<?lsmb text('User') ?>">
+<div id="user_div" class="lsmbtab"  title="<?lsmb text('User') ?>">
 	<div class="listtop">
             <?lsmb 
                IF request.pls_import;

Modified: trunk/UI/Contact/divs/wage.html
===================================================================
--- trunk/UI/Contact/divs/wage.html	2013-09-18 08:22:45 UTC (rev 6049)
+++ trunk/UI/Contact/divs/wage.html	2013-09-18 11:11:47 UTC (rev 6050)
@@ -1,4 +1,4 @@
-<div class="container" id="wage_div" 
+<div class="lsmbtab" id="wage_div" 
      title='<?lsmb text("Wages and Deductions") ?>'>
 <?lsmb 
 columns = [{ col_id = 'type', name = text('Type'), type = 'text' },

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


------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits