← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13036: when context menu is shown, mark current td in blue color (from menu)

 

------------------------------------------------------------
revno: 13036
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-11-27 16:32:03 +0100
message:
  when context menu is shown, mark current td in blue color (from menu)
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-11-27 12:48:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-11-27 15:32:03 +0000
@@ -233,6 +233,11 @@
   background-color : #eee;
 }
 
+.contextMenuItemActive {
+  background-color: #276696;
+  color: #fff;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Left bar                                                                   */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-11-27 12:48:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-11-27 15:32:03 +0000
@@ -233,6 +233,11 @@
   background-color : #eee;
 }
 
+.contextMenuItemActive {
+  background-color: #276696;
+  color: #fff;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Left bar                                                                   */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-11-27 12:48:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-11-27 15:32:03 +0000
@@ -207,8 +207,8 @@
   background-color           : #f7f7f7;
   display                    : none;
   z-index                    : 10;
-  filter                     : alpha(opacity=94);
-  opacity                    : 0.94;
+  filter                     : alpha(opacity=98);
+  opacity                    : 0.98;
   border-bottom-left-radius  : 3px;
   border-bottom-right-radius : 3px;
   box-shadow                 : #ccc 0px 1px 1px 0px;
@@ -233,6 +233,11 @@
   background-color : #eee;
 }
 
+.contextMenuItemActive {
+  background-color: #276696;
+  color: #fff;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Left bar                                                                   */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-11-27 12:48:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-11-27 15:32:03 +0000
@@ -233,6 +233,11 @@
   background-color : #eee;
 }
 
+.contextMenuItemActive {
+  background-color: #276696;
+  color: #fff;
+}
+
 /*----------------------------------------------------------------------------*/
 /* Left bar                                                                   */
 /*----------------------------------------------------------------------------*/

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js	2013-11-27 12:48:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js	2013-11-27 15:32:03 +0000
@@ -43,6 +43,10 @@
     $contextMenu.css({left: e.pageX, top: e.pageY});
 
     var $target = $(e.target);
+
+    $list.find('td').removeClass('contextMenuItemActive');
+    $target.addClass('contextMenuItemActive');
+
     $contextMenu.data('id', $target.data('id'));
     $contextMenu.data('uid', $target.data('uid'));
     $contextMenu.data('name', $target.data('name'));
@@ -55,6 +59,8 @@
       $contextMenu.hide();
     }
 
+    $list.find('td').removeClass('contextMenuItemActive');
+
     $contextMenu.removeData('id');
   });
 });

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm	2013-11-27 12:48:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm	2013-11-27 15:32:03 +0000
@@ -33,9 +33,6 @@
         <thead>
 				<tr>
 					<th>$i18n.getString( "name" )</th>
-          <!--
-					<th class="{sorter: false}">$i18n.getString( "operations" )</th>
-					-->
 				</tr>
         </thead>
 				<tbody id="list">
@@ -43,15 +40,6 @@
 				#if( $concept.id != $defaultConcept.id )
 				<tr id="tr${concept.id}" style="height: 40px;">
           <td data-id="$concept.id" data-uid="$concept.uid" data-name="$encoder.htmlEncode( $concept.name )">$encoder.htmlEncode( $concept.name )</td>
-
-          <!--
-					<td onclick="javascript:showConceptDetails( $concept.id )">$encoder.htmlEncode( $concept.name )</td>
-					<td style="text-align:right">
-						<a href="showUpdateConceptForm.action?id=$concept.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
-						<a href="javascript:removeConcept( $concept.id, '$encoder.jsEncode( $concept.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
-						<a href="javascript:showConceptDetails( $concept.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"/></a>
-					</td>
-					-->
 				</tr>
 				#end
 				#end
@@ -60,22 +48,25 @@
 			<p></p>
 			#parse( "/dhis-web-commons/paging/paging.vm" )
 		</td>
-		
-		<td id="detailsData">
-
-            <div id="detailsArea">
-                <div id="hideDetailsArea">
-					<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
-				</div>
-				<p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
-			</div>
-
-			<div id="warningArea">
-                <div id="hideDetailsArea">
-                    <a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/></a>
-                </div>
-                <p><span id="warningField"></span></p>
-            </div>
-		</td>
-	</tr>
+
+    <td id="detailsData">
+      <div id="detailsArea">
+        <div id="hideDetailsArea">
+          <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )">
+            <img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/>
+          </a>
+        </div>
+        <p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
+      </div>
+
+      <div id="warningArea">
+        <div id="hideDetailsArea">
+          <a href="javascript:hideWarning()" title="$i18n.getString( 'hide_warning' )">
+            <img src="../images/hide.png" alt="$i18n.getString( 'hide_warning' )"/>
+          </a>
+        </div>
+        <p><span id="warningField"></span></p>
+      </div>
+    </td>
+  </tr>
 </table>