Merge branch 'develop' of github.com:exponentcms/exponent-cms into de…

…velop
notzen · Sep 14, 2011 · 27cbae2 · 27cbae2
2 parents 51bd3b7 + 3244b71
commit 27cbae2
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 28 deletions.
diff --git a/framework/core/subsystems-1/forms/controls/calendarcontrol.php b/framework/core/subsystems-1/forms/controls/calendarcontrol.php
@@ -93,8 +93,8 @@ function controlToHTML($name,$label) {
         ";
 
         $script = "
-        YUI(EXPONENT.YUI3_CONFIG).use('node', function(Y) {
-
+        YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-button','yui2-calendar','yui2-container','yui2-dragdrop','yui2-slider', function(Y) {
+            var YAHOO=Y.YUI2;
             var Event = YAHOO.util.Event,
                 Dom = YAHOO.util.Dom,
                 dialog,
@@ -132,9 +132,9 @@ function controlToHTML($name,$label) {
                     Event.on(document, \"click\", function(e) {
                         var el = Event.getTarget(e);
                         var dialogEl = dialog.element;
-                        if (el != dialogEl && !Dom.isAncestor(dialogEl, el) && el != showBtn && !Dom.isAncestor(showBtn, el)) {
-                            dialog.hide();
-                        }
+                        // if (el != dialogEl && !Dom.isAncestor(dialogEl, el) && el != showBtn && !Dom.isAncestor(showBtn, el)) {
+                        //     dialog.hide();
+                        // }
                     });
 
                     function resetHandler() {
@@ -248,10 +248,9 @@ function closeHandler() {
 
         expJavascript::pushToFoot(array(
             "unique"=>'calpop'.$name,
-            "yui2mods"=>"button,calendar,container,dragdrop,slider",
-            "yui3mods"=>null,
-            "content"=>$script,
-            "src"=>""
+            //"yui2mods"=>"button,calendar,container,dragdrop,slider",
+            "yui3mods"=>1,
+            "content"=>$script
          ));
          return $html;
     }

diff --git a/framework/modules/blog/views/blog/edit.tpl b/framework/modules/blog/views/blog/edit.tpl
@@ -57,7 +57,7 @@
 
 {script unique="blogtabs" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
         var tabView = new YAHOO.widget.TabView('demo');
         YAHOO.util.Dom.removeClass("editblog", 'hide');

diff --git a/framework/modules/common/views/scaffold/configure.tpl b/framework/modules/common/views/scaffold/configure.tpl
@@ -40,7 +40,7 @@
 
 {script unique="conf" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
 		var tabView = new YAHOO.widget.TabView('tabs');		
         YAHOO.util.Dom.removeClass("config", 'hide');

diff --git a/framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/authorizedotnet/configure.tpl
@@ -51,7 +51,7 @@
 
 {script unique="authtabs" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
         var tabView = new YAHOO.widget.TabView('auth');
         YAHOO.util.Dom.removeClass("authcfg", 'hide');

diff --git a/framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/payflowpro/configure.tpl
@@ -51,7 +51,7 @@
 
 {script unique="authtabs" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
         var tabView = new YAHOO.widget.TabView('auth');
         YAHOO.util.Dom.removeClass("authcfg", 'hide');

diff --git a/framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/paypalExpressCheckout/configure.tpl
@@ -44,7 +44,7 @@
 
 {script unique="authtabs" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
         var tabView = new YAHOO.widget.TabView('auth');
         YAHOO.util.Dom.removeClass("authcfg", 'hide');

diff --git a/framework/modules/ecommerce/billingcalculators/views/splitcreditcard/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/splitcreditcard/configure.tpl
@@ -39,7 +39,7 @@
 
 {script unique="authtabs" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
         var tabView = new YAHOO.widget.TabView('auth');
         YAHOO.util.Dom.removeClass("authcfg", 'hide');

diff --git a/framework/modules/ecommerce/billingcalculators/views/worldpayCheckout/configure.tpl b/framework/modules/ecommerce/billingcalculators/views/worldpayCheckout/configure.tpl
@@ -44,7 +44,7 @@
 
 {script unique="authtabs" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
         var tabView = new YAHOO.widget.TabView('auth');
         YAHOO.util.Dom.removeClass("authcfg", 'hide');

diff --git a/framework/modules/ecommerce/products/views/donation/edit.tpl b/framework/modules/ecommerce/products/views/donation/edit.tpl
@@ -77,7 +77,7 @@
 
 {script unique="authtabs" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
         var tabView = new YAHOO.widget.TabView('demo');
         YAHOO.util.Dom.removeClass("editproduct", 'hide');

diff --git a/framework/modules/ecommerce/products/views/eventregistration/edit.tpl b/framework/modules/ecommerce/products/views/eventregistration/edit.tpl
@@ -78,7 +78,7 @@
 
 {script unique="authtabs" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
         var tabView = new YAHOO.widget.TabView('demo');
         YAHOO.util.Dom.removeClass("editproduct", 'hide');

diff --git a/framework/modules/ecommerce/products/views/giftcard/edit.tpl b/framework/modules/ecommerce/products/views/giftcard/edit.tpl
@@ -80,7 +80,7 @@
 
 {script unique="authtabs" yui3mods=1}
 {literal}
-    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview','yui2-tabview', function(Y) {
+    YUI(EXPONENT.YUI3_CONFIG).use('node','yui2-yahoo-dom-event','yui2-tabview', function(Y) {
         var YAHOO=Y.YUI2;
         var tabView = new YAHOO.widget.TabView('demo');
         YAHOO.util.Dom.removeClass("editproduct", 'hide');

diff --git a/framework/modules/report/assets/css/generate-report.css b/framework/modules/report/assets/css/generate-report.css
@@ -109,7 +109,7 @@
     border-width:1px 0 0 1px;
     margin:30px 0 5px 12px;
 }
-.report.generate-report .actions-to-apply .exp-ecom-link {
+.report.generate-report .actions-to-apply .awesome {
     position:absolute;
     top:-12px;
     right:-10px;

diff --git a/framework/modules/report/controllers/reportController.php b/framework/modules/report/controllers/reportController.php
@@ -421,7 +421,7 @@ function order_report (){
 
 	function generateOrderReport (){
         global $db;
-        eDebug($this->params);
+        //eDebug($this->params);
         $p = $this->params;   
 
         //eDebug();
@@ -712,7 +712,7 @@ function generateOrderReport (){
         //$items = $order->find('all', 1, 'id DESC',25);  
         //$res = $mod->find('all',$sql,'id',25);
         //eDebug($items);
-        eDebug($sql . $sqlwhere); 
+        //eDebug($sql . $sqlwhere); 
 
         $page = new expPaginator(array(
             //'model'=>'order',

diff --git a/framework/modules/report/views/report/generateOrderReport.tpl b/framework/modules/report/views/report/generateOrderReport.tpl
@@ -1,4 +1,4 @@
-{css unique="ecom-report1" link="`$asset_path`/css/ecom.css"}
+{css unique="ecom-report1" link="`$asset_path`/css/ecom.css" corecss="button,tables"}
 
 {/css} 
 {css unique="ecom-report2" link="`$asset_path`/css/generate-report.css"}
@@ -11,9 +11,9 @@
     <div class="actions-to-apply">
         {control type="dropdown" name="action" label="Select Action" items=$action_items}
         {control type="checkbox" name="applytoall" label="Apply to all pages" class="applytoall" value=1}
-        <a href="javascript:document.getElementById('batch').submit();" class="exp-ecom-link"><strong><em>Apply Batch Action</em></strong></a>
+        <button type="submit" class="awesome {$smarty.const.BTN_SIZE} {$smarty.const.BTN_COLOR}">{"Apply Batch Action"|gettext}</button>
     </div>
-    <div class="exp-ecom-table">
+    <div class="exp-skin-table">
         {$page->table}
     </div>
     {/form}

diff --git a/framework/modules/report/views/report/generate_report.tpl b/framework/modules/report/views/report/generate_report.tpl
@@ -1,4 +1,4 @@
-{css unique="ecom-report1" link="`$asset_path`/css/ecom.css"}
+{css unique="ecom-report1" link="`$asset_path`/css/ecom.css" corecss="button,tables"}
 
 {/css} 
 {css unique="ecom-report2" link="`$asset_path`/css/generate-report.css"}
@@ -11,9 +11,9 @@
     <div class="actions-to-apply">
         {control type="dropdown" name="action" label="Select Action" items="Add Notes,Delete,Apply Discount,Refund"}
         {control type="checkbox" name="applytoall" label="Apply to all pages" class="applytoall" value=1}
-        <a href="javascript:document.getElementById('batch').submit();" class="exp-ecom-link"><strong><em>Apply Batch Action</em></strong></a>
+        <button type="submit" class="awesome {$smarty.const.BTN_SIZE} {$smarty.const.BTN_COLOR}">{"Apply Batch Action"|gettext}</button>
     </div>
-    <div class="exp-ecom-table">
+    <div class="exp-skin-table">
         {$page->table}
     </div>
     {/form}