Changeset 13328 in main


Ignore:
Timestamp:
03/07/17 22:21:01 (5 years ago)
Author:
Garth Braithwaite
Message:

admin, java - removed ROLE_NAME from UserToIndicator?. Temp commit of JSPs - nav with popup and inline sub menus. Before reworking include to get dataset and view sub menus the way lois wants them.

Location:
trunk
Files:
1 added
67 edited

Legend:

Unmodified
Added
Removed
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/_menu_items.jsp

    r13316 r13328  
    6161        <ul>
    6262                <li><a href="javascript:requestPage('edit/indicator/list')"   title="Show the Main Indicator List page">Indicators</a></li>
     63                <li><a href="javascript:requestPage('edit/topic/list')"       title="Show the Topic list page">Topics</a></li>
     64                <li><a href="javascript:requestPage('edit/initiative/list')"  title="Show the initiative list page">Initiative Objectives</a></li>
     65
    6366                <li><a href="javascript:requestPage('edit/data_source/list')" title="Show the Data Sources list page">Data Sources</a></li>
    6467                <li><a href="javascript:requestPage('edit/dimension/list')"   title="Show the Dimension list page">Dimensions</a></li>
    65                 <li><a href="javascript:requestPage('edit/initiative/list')"  title="Show the initiative list page">Initiative Objectives</a></li>
    66                 <li><a href="javascript:requestPage('edit/topic/list')"       title="Show the Topic list page">Topics</a></li>
    67                 <li><a href="javascript:requestPage('edit/org_unit/list')"    title="Show the Org Unit list page">Org Units</a></li>
     68                <li><a href="javascript:requestPage('edit/measure/list')"     title="Show the Measure list page">Measures</a></li>
    6869                <li><a href="javascript:requestPage('edit/value_type/list')"  title="Show the Value Type list page">Value Types</a></li>
    69                 <li><a href="javascript:requestPage('edit/measure/list')"     title="Show the Measure list page">Measures</a></li>
    7070                <li><a href="javascript:requestPage('edit/value_attribute/list')" title="Show the value attribute list page">Value Attributes</a></li>
    7171                <li><a href="javascript:requestPage('edit/ancillary_value/list')" title="Show the ancillary value definition list page">Ancillary Values</a></li>
     
    7676                <li><a href="javascript:requestPage('edit/authority/list')"   title="Show the Authority list page">Authorities</a></li>
    7777                <li><a href="javascript:requestPage('edit/user/list')"        title="Show the User list page">Users</a></li>
     78                <li><a href="javascript:requestPage('edit/org_unit/list')"    title="Show the Org Unit list page">Org Units</a></li>
    7879<!--
    7980                <li id="system/command"><a href="javascript:requestPage('edit/system/command.html')" title="Show the Reposiory Publishing page">Run Command (deployment scripts)</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/ancillary_value/detail.jsp

    r13315 r13328  
    4444                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4545                        <h2>Navigation Menu</h2>
    46                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     46                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4747
    4848<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/ancillary_value/list.jsp

    r13315 r13328  
    7474                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7575                        <h2>Navigation Menu</h2>
    76                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     76                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    7777
    7878<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/authority/detail.jsp

    r13315 r13328  
    4444                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4545                        <h2>Navigation Menu</h2>
    46                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     46                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4747
    4848<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/authority/list.jsp

    r13315 r13328  
    6262                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6363                        <h2>Navigation Menu</h2>
    64                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     64                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6565
    6666<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/chart/detail.jsp

    r13315 r13328  
    4444                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4545                        <h2>Navigation Menu</h2>
    46                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     46                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4747
    4848<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/chart/list.jsp

    r13316 r13328  
    7373                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7474                        <h2>Navigation Menu</h2>
    75                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     75<!--
     76                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
     77                        <ul class="VerticalMenu ExpandableList VerticalPopoutList RightControl" id="navigationMenuList">
     78
     79                        shows on hover, still need checkbox to control if shows.
     80                        <ul class=" ExpandableList VerticalPopoutList RightControl" id="navigationMenuList">
     81
     82                        pure popout but needs checkbox styling
     83                        <ul class="VerticalMenu VerticalPopoutList RightControl" id="navigationMenuList">
     84
     85                        standard popout
     86                        <ul class="VerticalPopoutList" id="navigationMenuList">
     87                        -->
     88                        <ul class="VerticalPopoutList" id="navigationMenuList">
    7689
    7790<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/data_source/detail.jsp

    r13316 r13328  
    5454                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    5555                        <h2>Navigation Menu</h2>
    56                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     56                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    5757
    5858<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/data_source/list.jsp

    r13315 r13328  
    8383                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    8484                        <h2>Navigation Menu</h2>
    85                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     85                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    8686
    8787<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/dimension/detail.jsp

    r13315 r13328  
    6666                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6767                        <h2>Navigation Menu</h2>
    68                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     68                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6969
    7070<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/dimension/list.jsp

    r13315 r13328  
    6060                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6161                        <h2>Navigation Menu</h2>
    62                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     62                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6363
    6464<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/dimension/values.jsp

    r13316 r13328  
    7777                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7878                        <h2>Navigation Menu</h2>
    79                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     79                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    8080
    8181<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/_indicator_menu_items.jsp

    r13315 r13328  
    33<li id="indicator/list"   ><a href="javascript:requestPage('edit/indicator/list')" title="Show the Main Indicator List page">Indicator List</a></li>
    44<li id="indicator/detail" ><a href="javascript:requestPage('edit/indicator/detail', '${selectedIndicatorName}')" title="Title, definition, numerator, denominator, etc.">Indicator Detail</a></li>
     5
     6${viewAndDatasetMenuItems}
     7
    58<li id="indicator/available_services" ><a href="javascript:requestPage('edit/indicator/available_services', '${selectedIndicatorName}')" title="Available services.">Available Services</a></li>
    69<li id="indicator/more_resources"     ><a href="javascript:requestPage('edit/indicator/more_resources',     '${selectedIndicatorName}')" title="Other resources.">More Resources</a></li>
    7 
    8 <c:if test="${not(userDetails.admin)}">
    9 <li id="indicator/view/list"          ><a href="javascript:requestPage('edit/indicator/view/list',   '${selectedIndicatorName}')" title="List of all chart/data views for the current, selected indicator.">Views</a></li>
    10 </c:if>
    11 
    12 <c:if test="${userDetails.admin}">
    13 <li><a href="javascript:requestPage('edit/indicator/dataset/list','${selectedIndicatorName}')" title="List of all datasets for the current, selected indicator.">Datasets</a></li>
    14 <li><a href="javascript:requestPage('edit/indicator/view/list',   '${selectedIndicatorName}')" title="List of all chart/data views for the current, selected indicator.">Views</a></li>
    15 </c:if>
    16 
     10<li id="indicator/topics"             ><a href="javascript:requestPage('edit/indicator/topics',      '${selectedIndicatorName}')" title="Related topics list for the selected indicators.">Related Topics</a></li>
    1711<li id="indicator/initiatives"        ><a href="javascript:requestPage('edit/indicator/initiatives', '${selectedIndicatorName}')" title="Initiative objectives for the current, selected indicator.">Health Initiatives</a></li>
    1812<li id="indicator/related_indicators" ><a href="javascript:requestPage('edit/indicator/related_indicators/PopChar', '${selectedIndicatorName}')"  title="Related indicators textual information and list of related indicators.">Related Indicators</a></li>
    19 <li id="indicator/topics"             ><a href="javascript:requestPage('edit/indicator/topics',      '${selectedIndicatorName}')" title="Related topics list for the selected indicators.">Related Topics</a></li>
    20 
    2113
    2214<c:if test="${userDetails.admin}">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/_menu_items.jsp

    r13315 r13328  
    11<%-- Menu Snippet that is related to Indicator Type Pages --%>
     2
     3<c:set var="viewAndDatasetMenuItems">
     4        <c:if test="${userDetails.admin}">
     5<li><a href="javascript:requestPage('edit/indicator/dataset/list','${selectedIndicatorName}')" title="List of all datasets for the current, selected indicator.">Datasets</a></li>
     6<li><a href="javascript:requestPage('edit/indicator/view/list',   '${selectedIndicatorName}')" title="List of all chart/data views for the current, selected indicator.">Views</a></li>
     7        </c:if>
     8        <c:if test="${not(userDetails.admin)}">
     9<li id="indicator/view/list"><a href="javascript:requestPage('edit/indicator/view/list/${selectedIndicatorName}.html')" title="List of all chart/data views for the current, selected indicator.">Views List</a>
     10        </c:if>
     11</c:set>
    212
    313<%@ include file="../_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/available_services.jsp

    r13315 r13328  
    3434                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    3535                        <h2>Navigation Menu</h2>
    36                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     36                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    3737
    3838<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/_menu_items.jsp

    r13316 r13328  
    11<%-- Menu Snippet that is related to Indicator Type Pages --%>
     2
     3<c:set var="viewAndDatasetMenuItems">
     4        <c:if test="${userDetails.admin}">
     5<li><a href="javascript:requestPage('edit/indicator/view/list',   '${selectedIndicatorName}')" title="List of all chart/data views for the current, selected indicator.">Views</a></li>
     6        </c:if>
     7        <c:if test="${not(userDetails.admin)}">
     8<li id="indicator/view/list"   ><a href="javascript:requestPage('edit/indicator/view/list/${selectedIndicatorName}.html')" title="List of all chart/data views for the current, selected indicator.">Views List</a>
     9<li id="indicator/view/detail" ><a href="javascript:requestPage('edit/indicator/view/detail', '${selectedIndicatorViewName}')" title="Chart's definition - type of, title, categories, labels, textual info.">View's Detail</a></li>
     10<li id="indicator/dataset/list"><a href="javascript:requestPage('edit/indicator/dataset/list/${selectedIndicatorName}.html')" title="List of all datasets for the current, selected indicator.">Datasets List</a></li>
     11        </c:if>
     12</c:set>
    213
    314<%@ include file="../../_menu_items.jsp"%>
     
    1324</li>
    1425
    15 <li>
     26<li class="InlineMenu">
    1627        <input id ="ExpandableListInputControl.indicatorDatasetMenu" type="checkbox" checked="checked" title="Show/hide admin nav menu">
    1728        <label for="ExpandableListInputControl.indicatorDatasetMenu" title="Admin user validation data maintenance.">Datasets Sub Menu</label>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/data_sources.jsp

    r13315 r13328  
    7373                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7474                        <h2>Navigation Menu</h2>
    75                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     75                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    7676
    7777<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/detail.jsp

    r13315 r13328  
    9191                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    9292                        <h2>Navigation Menu</h2>
    93                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     93                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    9494
    9595<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/dimensions.jsp

    r13315 r13328  
    8888                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    8989                        <h2>Navigation Menu</h2>
    90                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     90                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    9191
    9292<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/list.jsp

    r13315 r13328  
    5151                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    5252                        <h2>Navigation Menu</h2>
    53                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     53                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    5454
    5555<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/record/_menu_items.jsp

    r13316 r13328  
    44
    55<li id="indicator/dataset/record/detail">
    6         <a href="javascript:requestPage('edit/indicator/dataset/record/detail/${selectedDatasetName}.html')"
     6        <a href="javascript:requestPage('edit/indicator/dataset/record/detail/${selectedDatasetRecordName}.html')"
    77                title="Detail of the selected indicator dataset record."
    88        >Record Detail</a>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/record/list.jsp

    r13316 r13328  
    1717                {
    1818                        min-height: 550px;
     19                }
     20                #content .Sections
     21                {
     22                        max-width: 900px;
     23                        overflow-x: auto;
    1924                }
    2025                #content form .ConstantDimensions select
     
    153158                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    154159                        <h2>Navigation Menu</h2>
    155                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     160                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    156161
    157162<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/detail.jsp

    r13315 r13328  
    1515<head>
    1616        <style>
    17                 .TabbedContent
     17                #content .Sections
     18                {
     19                        width: 900px;
     20                }
     21        .TabbedContent
    1822                {
    1923                        min-height: 710px;
     
    9599                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    96100                        <h2>Navigation Menu</h2>
    97                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     101                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    98102
    99103<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/editors.jsp

    r13315 r13328  
    4949                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    5050                        <h2>Navigation Menu</h2>
    51                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     51                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    5252
    5353<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/footnote_references.jsp

    r13315 r13328  
    3434                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    3535                        <h2>Navigation Menu</h2>
    36                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     36                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    3737
    3838<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/initiatives.jsp

    r13315 r13328  
    6363                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6464                        <h2>Navigation Menu</h2>
    65                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     65                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6666
    6767<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/list.jsp

    r13315 r13328  
    7575                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7676                        <h2>Navigation Menu</h2>
    77                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     77                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    7878
    7979<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/more_resources.jsp

    r13315 r13328  
    3434                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    3535                        <h2>Navigation Menu</h2>
    36                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     36                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    3737
    3838<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/owner.jsp

    r13315 r13328  
    4141                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4242                        <h2>Navigation Menu</h2>
    43                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     43                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4444
    4545<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/related_indicators.jsp

    r13315 r13328  
    2525
    2626<%@ include file="../_head.jsp"%>
     27
     28        <style>
     29                #content #listContainer
     30                {
     31                        max-height:             500px;
     32                        overflow:                       auto;
     33                }
     34        </style>
    2735
    2836        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/ModalDialog.css"/>
     
    132140                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    133141                        <h2>Navigation Menu</h2>
    134                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     142                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    135143
    136144<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/topics.jsp

    r13315 r13328  
    7575                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7676                        <h2>Navigation Menu</h2>
    77                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     77                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    7878
    7979<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/_menu_items.jsp

    r13315 r13328  
    11<%-- Menu Snippet that is related to Indicator View Type Pages --%>
    22
    3 <c:if test="${userDetails.admin}">
    4         <%@ include file="../../_menu_items.jsp"%>
    5         <li id="indicator/list"  ><a href="javascript:requestPage('edit/indicator/list/${selectedIndicatorName}.html')" title="List of all your indicators.">Indicators List</a></li>
    6         <li id="indicator/detail"><a href="javascript:requestPage('edit/indicator/detail/${selectedIndicatorName}.html')" title="Title, definition, numerator, denominator, etc.">Indicator Detail</a></li>
    7         <li id="indicator/dataset/list"><a href="javascript:requestPage('edit/indicator/dataset/list/${selectedIndicatorName}.html')" title="datasets list">Datasets List</a></li>
    8         <li id="indicator/view/list"    ><a href="javascript:requestPage('edit/indicator/view/list/${selectedIndicatorName}.html')" title="List of all chart/data views for the current, selected indicator.">Views List</a>
    9 <ul>
     3<c:set var="viewAndDatasetMenuItems">
     4        <c:if test="${userDetails.admin}">
     5<li><a href="javascript:requestPage('edit/indicator/dataset/list','${selectedIndicatorName}')" title="List of all datasets for the current, selected indicator.">Datasets</a></li>
     6        </c:if>
     7        <c:if test="${not(userDetails.admin)}">
     8<li id="indicator/view/list"   ><a href="javascript:requestPage('edit/indicator/view/list/${selectedIndicatorName}.html')" title="List of all chart/data views for the current, selected indicator.">Views List</a>
     9<li id="indicator/view/detail" ><a href="javascript:requestPage('edit/indicator/view/detail', '${selectedIndicatorViewName}')" title="Chart's definition - type of, title, categories, labels, textual info.">View's Detail</a></li>
     10<li id="indicator/dataset/list"><a href="javascript:requestPage('edit/indicator/dataset/list/${selectedIndicatorName}.html')" title="List of all datasets for the current, selected indicator.">Datasets List</a></li>
     11        </c:if>
     12</c:set>
     13
     14<%@ include file="../../_menu_items.jsp"%>
     15
     16<li>
     17        <input id ="ExpandableListInputControl.indicatorMenu" type="checkbox" title="Show/hide admin nav menu">
     18        <label for="ExpandableListInputControl.indicatorMenu" title="Admin user validation data maintenance.">Indicator Menu</label>
     19        <ul>
     20
     21<%@ include file="../_indicator_menu_items.jsp"%>
     22
     23        </ul>
     24</li>
     25
     26<li class="InlineMenu">
     27        <input id ="ExpandableListInputControl.indicatorViewMenu" type="checkbox" checked="checked" title="Show/hide view nav sub menu">
     28        <label for="ExpandableListInputControl.indicatorViewMenu" title="Admin user views maintenance.">Views Sub Menu</label>
     29        <ul>
     30                <li id="indicator/view/list"    ><a href="javascript:requestPage('edit/indicator/view/list/${selectedIndicatorName}.html')" title="List of all chart/data views for the current, selected indicator.">Views List</a>
    1031                <li id="indicator/view/detail"  ><a href="javascript:requestPage('edit/indicator/view/detail',   '${selectedIndicatorViewName}')" title="Chart's definition - type of, title, categories, labels, textual info.">View's Detail</a></li>
    1132                <li id="indicator/view/datasets"><a href="javascript:requestPage('edit/indicator/view/datasets', '${selectedIndicatorViewName}')" title="Data view's datasets.">View's Datasets</a></li>
    1233                <li id="indicator/view/dimensions"><a href="javascript:requestPage('edit/indicator/view/dimensions', '${selectedIndicatorViewName}')" title="Data view's dataset dimensions.">View's Dimensions</a></li>
    13                 <li id="indicator/view/dimension/values" class="MultiLine"><a href="javascript:requestPage('edit/indicator/view/dimension/values', '${selectedIndicatorViewName}')" title="View's dimension values.">View's Dimension Values</a></li>
     34                <li id="indicator/view/dimension/values" class="MultiLine">
     35                        <a href="javascript:requestPage('edit/indicator/view/dimension/values', '${selectedIndicatorViewName}')"
     36                                title="View's dimension values."
     37                        >View's Dimension<br/> Values</a>
     38                </li>
    1439                <li id="indicator/view/queries" ><a href="javascript:requestPage('edit/indicator/view/queries',  '${selectedIndicatorViewName}')" title="Edit saved query list.">View's Queries</a></li>
    15 </ul>
    16         </li>
    17 </c:if>
    18 
    19 <c:if test="${not(userDetails.admin)}">
    20         <%@ include file="../_menu_items.jsp"%>
    21 </c:if>
     40        </ul>
     41</li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/datasets.jsp

    r13315 r13328  
    4343                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4444                        <h2>Navigation Menu</h2>
    45                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     45                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4646
    4747<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/detail.jsp

    r13315 r13328  
    8585                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    8686                        <h2>Navigation Menu</h2>
    87                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     87                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    8888
    8989<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/dimension_values.jsp

    r13315 r13328  
    7474                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7575                        <h2>Navigation Menu</h2>
    76                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     76                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    7777
    7878<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/dimensions.jsp

    r13315 r13328  
    8181                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    8282                        <h2>Navigation Menu</h2>
    83                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     83                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    8484
    8585<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/list.jsp

    r13315 r13328  
    6161                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6262                        <h2>Navigation Menu</h2>
    63                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     63                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
     64
     65<c:if test="${not(userDetails.admin)}">
     66<li id="indicator/view/list"          ><a href="javascript:requestPage('edit/indicator/view/list',   '${selectedIndicatorName}')" title="List of all chart/data views for the current, selected indicator.">Views</a></li>
     67</c:if>
     68
     69<c:set var="garth">
     70<li><a>        USD,EUR,AUD,INR</a></li>
     71</c:set>
    6472
    6573<%@ include file="_menu_items.jsp"%>
    6674
    67                                 <li class="">
    68                                         <ul>
    69 <%@ include file="_sublist_menu_items.jsp"%>
    7075                                                <li id="editButton" class="Button" title="Edit the detail of the selected item">
    7176                                                        <a href="javascript:requestPage('edit/indicator/view/detail/${selectedIndicatorViewName}.html')">Edit Detail</a>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/queries.jsp

    r13315 r13328  
    121121                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    122122                        <h2>Navigation Menu</h2>
    123                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     123                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    124124
    125125<%@ include file="_menu_items.jsp"%>
     
    142142
    143143                <div class="Sections">
     144               
     145               
     146This really needs to be at the IP level and general URL.  Maybe a type indicates
     147if an outside link, saved query, or a saved query to get data and put into the
     148view report????
     149
    144150                        <form name="form" method="post" action="${pageContext.request.contextPath}/save/indicator/view/queries">
    145151                                <h2 class="Header" title="Indicator View Name: ${indicatorView.name}">${pageTitle}</h2>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/detail.jsp

    r13315 r13328  
    4545                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4646                        <h2>Navigation Menu</h2>
    47                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     47                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4848
    4949<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/list.jsp

    r13315 r13328  
    6060                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6161                        <h2>Navigation Menu</h2>
    62                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     62                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6363
    6464<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/detail.jsp

    r13315 r13328  
    5050                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    5151                        <h2>Navigation Menu</h2>
    52                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     52                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    5353
    5454<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/list.jsp

    r13315 r13328  
    6060                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6161                        <h2>Navigation Menu</h2>
    62                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     62                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6363
    6464<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/objective/detail.jsp

    r13315 r13328  
    6060                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6161                        <h2>Navigation Menu</h2>
    62                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     62                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6363
    6464<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/objective/list.jsp

    r13315 r13328  
    6060                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6161                        <h2>Navigation Menu</h2>
    62                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     62                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6363
    6464<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/map/detail.jsp

    r13315 r13328  
    4444                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4545                        <h2>Navigation Menu</h2>
    46                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     46                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4747
    4848<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/map/list.jsp

    r13315 r13328  
    6060                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6161                        <h2>Navigation Menu</h2>
    62                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     62                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6363
    6464<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/measure/detail.jsp

    r13315 r13328  
    4444                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4545                        <h2>Navigation Menu</h2>
    46                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     46                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4747
    4848<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/measure/list.jsp

    r13315 r13328  
    7474                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7575                        <h2>Navigation Menu</h2>
    76                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     76                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    7777
    7878<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/org_unit/detail.jsp

    r13315 r13328  
    4949                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    5050                        <h2>Navigation Menu</h2>
    51                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     51                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    5252
    5353<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/org_unit/list.jsp

    r13315 r13328  
    7171                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7272                        <h2>Navigation Menu</h2>
    73                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     73                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    7474
    7575<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/system/command.jsp

    r13315 r13328  
    6363                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6464                        <h2>Navigation Menu</h2>
    65                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     65                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6666
    6767<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/system/text_file.jsp

    r13315 r13328  
    5353                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    5454                        <h2>Navigation Menu</h2>
    55                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     55                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    5656
    5757<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/topic/detail.jsp

    r13315 r13328  
    4444                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4545                        <h2>Navigation Menu</h2>
    46                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     46                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4747
    4848<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/topic/list.jsp

    r13315 r13328  
    6161                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    6262                        <h2>Navigation Menu</h2>
    63                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     63                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    6464
    6565<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/user/authorities.jsp

    r13315 r13328  
    4040                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4141                        <h2>Navigation Menu</h2>
    42                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     42                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4343
    4444<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/user/detail.jsp

    r13315 r13328  
    5151                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    5252                        <h2>Navigation Menu</h2>
    53                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     53                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    5454
    5555<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/user/list.jsp

    r13315 r13328  
    2828                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    2929                        <h2>Navigation Menu</h2>
    30                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     30                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    3131
    3232<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/user/roles.jsp

    r13315 r13328  
    4040                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4141                        <h2>Navigation Menu</h2>
    42                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     42                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4343
    4444<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_attribute/detail.jsp

    r13316 r13328  
    4444                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4545                        <h2>Navigation Menu</h2>
    46                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     46                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4747
    4848<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_attribute/list.jsp

    r13315 r13328  
    7474                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7575                        <h2>Navigation Menu</h2>
    76                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     76                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    7777
    7878<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_type/detail.jsp

    r13315 r13328  
    4444                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4545                        <h2>Navigation Menu</h2>
    46                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     46                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    4747
    4848<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_type/list.jsp

    r13315 r13328  
    7474                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7575                        <h2>Navigation Menu</h2>
    76                         <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     76                        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    7777
    7878<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/css/_layout.css

    r13315 r13328  
    102102}
    103103
     104#content, img
     105{
     106        font-size:                      smaller; /* .70 (IE) -72 (FF)=original small.  75%=little bit bigger */
     107        border:                         0 none transparent;
     108}
     109
    104110
    105111/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ L E F T   M E N U   T A B S */
     
    125131#navigationMenu #navigationMenuList
    126132{
    127         position:                       absolute;
    128         top:                            0;
    129 }
    130 
    131 
    132 #navigationMenu .VerticalMenu
    133 {
    134         border:                         1px solid #336699;
    135         border-left:            none;
    136 
    137         -moz-border-radius:     0px 5px 5px 0px; 
    138         -webkit-border-radius: 0px 5px 5px 0px; 
    139         border-radius:          0px 5px 5px 0px;
    140 
    141         box-shadow:             6px 6px 6px -6px #464135;/* 8c8270;*/
     133        -moz-box-shadow:        2px 2px 5px 2px #777;
     134    -webkit-box-shadow: 2px 2px 5px 2px #777;
     135    box-shadow:                 2px 2px 5px 2px #777;
     136}
     137
     138
     139#navigationMenu ul input
     140{
     141        /*
     142                defs to make input keyboard navigatable.  Specifying a floated size also
     143                provides padding for the label/control image.  If no size specified then
     144                some browsers will not provide keyboard focus on the element.  If no
     145                focus then the below can simply be handed via: display:none;
     146        */
     147        float:             right;
     148        width:             1px;
     149        height:            1px;
     150        opacity:           0;
     151        z-index:           1;
     152}
     153#navigationMenu ul input + label
     154{
     155        background:                     #6699CC url('../image/icon/16/triangle-right_circle-blue.png') no-repeat right 3px center;
     156}
     157#navigationMenu ul li:hover input + label
     158{
     159        background-color:       #336699;
     160        background-image:       none;
    142161}
    143162
     
    166185}
    167186#navigationMenu ul li a:hover,
    168 #navigationMenu .VerticalMenu li ul li a:hover
    169 {
    170         color:  #ffcc66;
     187#navigationMenu ul li ul li a:hover
     188{
     189        color:                          #ffcc66;
    171190}
    172191#navigationMenu li.MultiLine > a
    173192{
    174         padding-top:             8px;
     193        padding-top:            8px;
    175194}
    176195
     
    187206
    188207/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ S U B   M E N U */
    189 #navigationMenu .VerticalMenu li ul li
    190 {
    191         background-color: white;
    192 }
    193 #navigationMenu .VerticalMenu li ul li
     208#navigationMenu ul li.InlineMenu label
     209{
     210        background-color:       #336699;
     211        background-image:       none;
     212}
     213
     214#navigationMenu ul li.InlineMenu ul
     215{
     216        position:                       relative;
     217        top:                            inherit;
     218        left:                           inherit;
     219        width:                          inherit;
     220        visibility:             visible;
     221        opacity:                        1;
     222
     223        -moz-box-shadow:        none;
     224        -webkit-box-shadow: none;
     225        box-shadow:                     none;
     226}
     227
     228#navigationMenu ul li.InlineMenu ul li
     229{
     230        background-color:       white;
     231}
     232#navigationMenu ul li.InlineMenu ul li
    194233{
    195234        border-top:                     1px solid #336699;
    196235}
    197236
    198 #navigationMenu .VerticalMenu li ul li label,
    199 #navigationMenu .VerticalMenu li ul li a
     237#navigationMenu ul li.InlineMenu ul li label,
     238#navigationMenu ul li.InlineMenu ul li a
    200239{
    201240        color:                          #003366;
    202241}
    203 #navigationMenu .VerticalMenu li ul li:hover,
    204 #navigationMenu .VerticalMenu li ul li:active,
    205 #navigationMenu .VerticalMenu li ul li:focus,
    206 #navigationMenu .VerticalMenu li ul li.On:hover
    207 {
    208         background-color:       #336699;
     242#navigationMenu ul li.InlineMenu ul li:hover,
     243#navigationMenu ul li.InlineMenu ul li:active,
     244#navigationMenu ul li.InlineMenu ul li:focus,
     245#navigationMenu ul li.InlineMenu ul li.On:hover
     246{
     247        background-color:       inherit;
    209248        border-top:                     1px solid #eee;
    210249}
    211 
    212 #navigationMenu .VerticalMenu li ul li.On       
     250#navigationMenu ul li.InlineMenu ul li.On       
    213251{
    214252        background-color:       #ddeeff;
    215253}
     254#navigationMenu ul li.InlineMenu ul li a:hover,
     255#navigationMenu ul li.InlineMenu ul li a:active,
     256#navigationMenu ul li.InlineMenu ul li a:focus,
     257#navigationMenu ul li.InlineMenu ul li.On a:hover       
     258{
     259        color:                          #ffcc66;
     260}
     261
     262
    216263
    217264/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ M E N U    B U T T O N S */
     
    219266#deleteButton.Show {display:block;}
    220267
    221 
    222268#navigationMenu li.Button a
    223269{
     
    275321{
    276322        display:                        table-cell;
    277 /*
    278         max-width:                      calc(99% - 160px);
    279         width:                          calc(99% - 160px);
    280         min-width:                      600px;
    281 */
    282323        padding:                        2px 5px 1em 1em;
    283324        vertical-align:         top;
     
    291332
    292333
    293 #content .Sections table
    294 {
    295 /*
    296         table-layout:           fixed;
    297         width:                          inherit;
    298 */
    299 }
    300 #content .Sections table tbody
    301 {
    302 /*
    303         display:                        block;
    304         overflow-x:             auto;
    305 */
    306 }
    307 
    308 
    309 #content .Sections .TabbedContent
     334#content .Sections .TabbedContent
    310335{
    311336        width:                          100%;
    312         /*
    313         overflow:                       auto;
    314         */
    315337}
    316338#content .Sections .TabbedContent .Tab > input:checked ~ .Container
    317339{
    318 /*
    319         width:                          100%;
    320         */
    321340        max-width:                      860px;
    322341}
     
    335354{
    336355        max-width:                      690px;
    337 }
    338 
    339 
    340 
    341 
    342 
    343 
    344 
    345 
    346 
    347 /*
    348         Controls the extra wide tables to fit within the content - auto adds scroll
    349         bar.  Note the table width can NOT be 100% or inherit as this will cause the
    350         horz scroll bar to be auto added IF the table above/below is wider.
    351 */
    352 #content .Sections .ScrollableContainer
    353 {
    354         width:                          100%;
    355         overflow:                       auto;
    356 }
    357 #content .Sections .ScrollableContainer table
    358 {
    359         width:                          99.5%;
    360 }
    361 
    362 
    363 
    364 
    365 
    366 
    367 
    368 #content, img
    369 {
    370         font-size:                      smaller; /* .70 (IE) -72 (FF)=original small.  75%=little bit bigger */
    371         padding:                        0px;     /* can't set for NN 4.x tables and assoc elements - messes things up */
    372         margin:                         0px;     /* same comment as above */
    373         border:                         0 none transparent;
    374 }
    375 #content #listContainer
    376 {
    377         max-height:             500px;
    378         overflow:                       auto;
    379356}
    380357
  • trunk/ibisph-admin/src/main/webapp/css/stylesheet.css

    r13314 r13328  
    4646/* core layout ID'd element definitions.  HTML body, #header, #content, #footer. */
    4747@import url('_layout.css');
    48 @import url('ExpandableList.css');
    49 @import url('VerticalMenu-ExpandableList.css');
     48@import url('VerticalPopoutList.css');
    5049
    5150
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/databean/UserToIndicator.java

    r11741 r13328  
    1515    addField("USER_ID",        Field.TYPE_STRING, true);
    1616    addField("INDICATOR_NAME", Field.TYPE_STRING, true);
    17     addField("ROLE_NAME",      Field.TYPE_STRING, true);
    1817  } //----------------------- End of Constructor ----------------------------
    1918
     
    2625    return( getStringFieldValue("INDICATOR_NAME") );
    2726  }
    28   public String getRoleName() {
    29     return( getStringFieldValue("ROLE_NAME") );
    30   }
    3127
    3228} //============================ END OF CLASS =================================
Note: See TracChangeset for help on using the changeset viewer.