Changeset 17861

Timestamp:

Sep 11, 2012, 3:22:24 PM (12 years ago)

Author:

grum

Message:

version 3.5.4
inputPage

. fix bug on page number & total page calculation

CSS

. fix some bugs & improve clear theme

Location:

extensions/GrumPluginClasses

Files:

• css/dynamicTable_clear.css (modified) (4 diffs)
• css/dynamicTable_roma.css (modified) (2 diffs)
• css/progressArea_clear.css (modified) (2 diffs)
• icons/buttons.png (modified) (previous)
• icons/buttons.xcf (modified) (previous)
• js/ui.dynamicTable.js (modified) (1 diff)
• js/ui.inputPages.js (modified) (2 diffs)

extensions/GrumPluginClasses/css/dynamicTable_clear.css

@@ -34 +34 @@
 div.ui-dynamicTableSortButton,
 div.ui-dynamicTableGroupButton-inactive,
-div.ui-dynamicTableGroupButton-active {
+div.ui-dynamicTableGroupButton-active,
+div.ui-dynamicTableFooter-saveButton {
   background-image:url(./../icons/buttons.png);
   background-repeat:no-repeat;
@@ -42 +43 @@
   border-radius:2px;
 }
-
+/*
 div.ui-dynamicTableFilterButton-inactive:hover,
 div.ui-dynamicTableFilterButton-active:hover,
 div.ui-dynamicTableSortButton:hover,
 div.ui-dynamicTableGroupButton-inactive:hover,
-div.ui-dynamicTableGroupButton-active:hover {
+div.ui-dynamicTableGroupButton-active:hover,
+div.ui-dynamicTableFooter-saveButton:hover {
   background-color:#999999;
 }
-
+*/
 div.ui-dynamicTableFilterButton-inactive {
   background-position:-120px -90px;
@@ -71 +73 @@
   background-position:-105px -105px;
 }
-
+/*
 div.ui-dynamicTableGroupButton-active {
   background-position:-360px -90px;
@@ -84 +86 @@
   background-position:-345px -105px;
 }
+*/
+
+div.ui-dynamicTableGroupButton-active {
+  background-position:-405px -90px;
+}
+div.ui-dynamicTableGroupButton-active:hover {
+  background-position:-405px -105px;
+}
+div.ui-dynamicTableGroupButton-inactive {
+  background-position:-390px -90px;
+}
+div.ui-dynamicTableGroupButton-inactive:hover {
+  background-position:-390px -105px;
+}
+
+
+div.ui-dynamicTableFooter-saveButton {
+  background-position:-375px -90px;
+}
+div.ui-dynamicTableFooter-saveButton:hover {
+  background-position:-375px -105px;
+}

extensions/GrumPluginClasses/css/dynamicTable_roma.css

@@ -73 +73 @@
   background-position:-105px 0px;
 }
-
+/*
 div.ui-dynamicTableGroupButton-active {
   background-position:-360px -15px;
@@ -86 +86 @@
   background-position:-345px 0px;
 }
+*/
+
+/* group button => display/hide lines */
+div.ui-dynamicTableGroupButton-active {
+  background-position:-405px -15px;
+}
+div.ui-dynamicTableGroupButton-active:hover {
+  background-position:-405px 0px;
+}
+div.ui-dynamicTableGroupButton-inactive {
+  background-position:-390px -15px;
+}
+div.ui-dynamicTableGroupButton-inactive:hover {
+  background-position:-390px 0px;
+}
+
+
 
 div.ui-dynamicTableFooter-saveButton {

extensions/GrumPluginClasses/css/progressArea_clear.css

@@ -18 +18 @@
 .ui-progressArea-globalBarProgress,
 .ui-progressArea-detailBarProgress {
-  background:#f9f9f9;
+  background:#999999;
 }
 
@@ -28 +28 @@
 /* dialog box */
 .ui-dialogProgressArea {
-  background:#AAAAAA;
+  color:#666666;
+  background:#DDDDDD;
   border:1px solid #999999;
 }
 .ui-dialogProgressArea div.ui-dialog-titlebar {
-  background:#DDDDDD;
-  color:#666666;
+  background:#999999;
+  color:#444444; /* #666666 is too light... */
 }
 .ui-dialogProgressArea div.ui-dialog-buttonpane button {

extensions/GrumPluginClasses/js/ui.dynamicTable.js

@@ -774 +774 @@
           privateMethods.setPagesNavigator(object, (value.pagesNavigator!=null)?value.pagesNavigator:options.pagesNavigator);
           //privateMethods.setCurrentPage(object, (value.currentPage!=null)?value.currentPage:options.currentPage);
-          //privateMethods.setNbItemsPage(object, (value.nbItemsPage!=null)?value.nbItemsPage:options.nbItemsPage);
+          privateMethods.setNbItemsPage(object, (value.nbItemsPage!=null)?value.nbItemsPage:options.nbItemsPage);
 
           privateMethods.setEventContentLoading(object, (value.contentLoading!=null)?value.contentLoading:options.contentLoading);

extensions/GrumPluginClasses/js/ui.inputPages.js

@@ -55 +55 @@
                     {
                       nbItems:0,
-                      nbITemsPage:50,
+                      nbItemsPage:50,
                       currentPage:1,
                       displayedPages:7,
@@ -551 +551 @@
               properties=object.data('properties');
 
-          properties.nbPages=Math.ceil(options.nbItems/options.nbITemsPage);
+          properties.nbPages=Math.ceil(options.nbItems/options.nbItemsPage);
         }, // calculateNbPages