Changeset 13315 in main


Ignore:
Timestamp:
03/06/17 16:10:55 (5 years ago)
Author:
Garth Braithwaite
Message:

admin - temp commit before changing requestPage code.

Location:
trunk/ibisph-admin/src/main/webapp
Files:
1 added
1 deleted
70 edited

Legend:

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

    r13313 r13315  
    4949        function afterLoad()
    5050        {
    51                 try { global.leftNavigationMenuElevator = new ElementElevator("leftNavigationMenu", true, false); }
     51                try { global.leftNavigationMenuElevator = new ElementElevator("navigationMenuList", true, false); }
    5252                catch(err) { global.leftNavigationMenuElevator = null; }
    5353                if(global.leftNavigationMenuElevator) window.onScrollEventManager.add(global.leftNavigationMenuElevator.windowScrollHandler);
     
    5555
    5656                // set the current page's left menu tab css class - shows current page on.
     57// could use "name" attribute and then code the common.js func below to look for
     58// multiple elements then either remove the first one from the menu list or add
     59// the On class to both?
    5760                initPageNameAndOnNavigationMenu();
    5861
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/_menu_items.jsp

    r13313 r13315  
    5656<c:if test="${userDetails.admin}">
    5757<li>
    58         <input  id="ExpandableListInputControl.navigationMenu" type="checkbox" title="Show/hide admin nav menu">
     58        <input id ="ExpandableListInputControl.navigationMenu" type="checkbox" title="Show/hide admin nav menu">
    5959        <label for="ExpandableListInputControl.navigationMenu" title="Admin user validation data maintenance.">Admin Menu</label>
    6060        <ul>
    61                 <li><a href="javascript:requestPage('edit/indicator/list')"   title="Show the Main Indicator List page">Indicator List</a></li>
     61                <li><a href="javascript:requestPage('edit/indicator/list')"   title="Show the Main Indicator List page">Indicators</a></li>
     62                <li><a href="javascript:requestPage('edit/data_source/list')" title="Show the Data Sources list page">Data Sources</a></li>
     63                <li><a href="javascript:requestPage('edit/dimension/list')"   title="Show the Dimension list page">Dimensions</a></li>
     64                <li><a href="javascript:requestPage('edit/initiative/list')"  title="Show the initiative list page">Initiative Objectives</a></li>
     65                <li><a href="javascript:requestPage('edit/topic/list')"       title="Show the Topic list page">Topics</a></li>
     66                <li><a href="javascript:requestPage('edit/org_unit/list')"    title="Show the Org Unit list page">Org Units</a></li>
     67                <li><a href="javascript:requestPage('edit/value_type/list')"  title="Show the Value Type list page">Value Types</a></li>
     68                <li><a href="javascript:requestPage('edit/measure/list')"     title="Show the Measure list page">Measures</a></li>
     69                <li><a href="javascript:requestPage('edit/value_attribute/list')" title="Show the value attribute list page">Value Attributes</a></li>
     70                <li><a href="javascript:requestPage('edit/ancillary_value/list')" title="Show the ancillary value definition list page">Ancillary Values</a></li>
    6271
    63                 <li><a href="javascript:requestPage('edit/data_source/list')" title="Show the Data Sources list page">Data Source List</a></li>
    64                 <li><a href="javascript:requestPage('edit/dimension/list')"   title="Show the Dimension list page">Dimension List</a></li>
     72                <li><a href="javascript:requestPage('edit/chart/list')"       title="Show the Chart list page">Charts</a></li>
     73                <li><a href="javascript:requestPage('edit/map/list')"         title="Show the Map list page">Maps</a></li>
    6574
    66                 <li><a href="javascript:requestPage('edit/value_type/list')"  title="Show the Value Type list page">Value Type List</a></li>
    67                 <li><a href="javascript:requestPage('edit/measure/list')"     title="Show the Measure list page">Measure List</a></li>
    68                 <li><a href="javascript:requestPage('edit/value_attribute/list')" title="Show the value attribute list page">Value Attribute List</a></li>
    69                 <li><a href="javascript:requestPage('edit/ancillary_value/list')" title="Show the ancillary value definition list page">Ancillary Value List</a></li>
    70 
    71                 <li><a href="javascript:requestPage('edit/initiative/list')"   title="Show the initiative list page">Initiative Objective List</a></li>
    72                 <li><a href="javascript:requestPage('edit/topic/list')"       title="Show the Topic list page">Topic List</a></li>
    73                 <li><a href="javascript:requestPage('edit/org_unit/list')"    title="Show the Org Unit list page">Org Unit List</a></li>
    74 
    75                 <li><a href="javascript:requestPage('edit/chart/list')"       title="Show the Chart list page">Chart List</a></li>
    76                 <li><a href="javascript:requestPage('edit/map/list')"         title="Show the Map list page">Map List</a></li>
    77 
    78                 <li><a href="javascript:requestPage('edit/authority/list')"   title="Show the Authority list page">Authority List</a></li>
    79                 <li><a href="javascript:requestPage('edit/user/list')"        title="Show the User list page">User List</a></li>
     75                <li><a href="javascript:requestPage('edit/authority/list')"   title="Show the Authority list page">Authorities</a></li>
     76                <li><a href="javascript:requestPage('edit/user/list')"        title="Show the User list page">Users</a></li>
     77<!--
     78                <li id="system/command"><a href="javascript:requestPage('edit/system/command.html')" title="Show the Reposiory Publishing page">Run Command (deployment scripts)</a></li>
     79-->
    8080        </ul>
    8181</li>
    82 <!--
    83 <li id="system/command"><a href="javascript:requestPage('edit/system/command.html')" title="Show the Reposiory Publishing page">Run Command (deployment scripts)</a></li>
    84 -->
    8582</c:if>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/ancillary_value/_menu_items.jsp

    r11498 r13315  
    33<%@ include file="../_menu_items.jsp"%>
    44
    5 <li id="ancillary_value/list"  ><a href="javascript:requestPage('edit/ancillary_value/list')"   title="List of">Ancillary Value List</a></li>
    6 <li id="ancillary_value/detail"><a href="javascript:requestPage('edit/ancillary_value/detail')" title="Detail of">Ancillary Value Detail</a></li>
     5<li id="ancillary_value/list" class="MultiLine">
     6        <a href="javascript:requestPage('edit/ancillary_value/list')"   
     7                title="List of Ancillary Values"
     8        >Ancillary Value<br/> List</a>
     9</li>
     10<li id="ancillary_value/detail"  class="MultiLine">
     11        <a href="javascript:requestPage('edit/ancillary_value/detail')"
     12                title="Detail of"
     13        >Ancillary Value<br/> Detail</a>
     14</li>
    715
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/ancillary_value/detail.jsp

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

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

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

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

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

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

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

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

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

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

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

    r13313 r13315  
    22
    33<%@ include file="../_menu_items.jsp"%>
     4<%@ include file="_indicator_menu_items.jsp"%>
    45
    5 <li id="indicator/list"               ><a href="javascript:requestPage('edit/indicator/list')" title="List of all your indicators.">Indicators List</a></li>
    6 <li id="indicator/detail"             ><a href="javascript:requestPage('edit/indicator/detail',      '${selectedIndicatorName}')" title="Title, definition, numerator, denominator, etc.">Indicator Detail</a></li>
    7 <li id="indicator/initiatives"        ><a href="javascript:requestPage('edit/indicator/initiatives', '${selectedIndicatorName}')" title="Initiative objectives for the current, selected indicator.">Health Initiatives</a></li>
    8 <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>
    9 <li id="indicator/topics"             ><a href="javascript:requestPage('edit/indicator/topics',      '${selectedIndicatorName}')" title="Related topics list for the selected indicators.">Related Topics</a></li>
    10 <li id="indicator/available_services" ><a href="javascript:requestPage('edit/indicator/available_services', '${selectedIndicatorName}')" title="Available services.">Available Services</a></li>
    11 <li id="indicator/more_resources"     ><a href="javascript:requestPage('edit/indicator/more_resources',     '${selectedIndicatorName}')" title="Other resources.">More Resources</a></li>
    12 
    13 <c:if test="${not(userDetails.admin)}">
    14 <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 List</a></li>
    15 </c:if>
    16 
    17 <c:if test="${userDetails.admin}">
    18 <li id="indicator/dataset/list"       ><a href="javascript:requestPage('edit/indicator/dataset/list','${selectedIndicatorName}')" title="List of all datasets for the current, selected indicator.">Datasets List</a></li>
    19 <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 List</a></li>
    20 <li id="indicator/owner"              ><a href="javascript:requestPage('edit/indicator/owner',       '${selectedIndicatorName}')"     title="Set the owner.">Owner</a></li>
    21 </c:if>
    22 
    23 <c:if test="${userDetails.admin || indicator.isOwner(userDetails.username)}">
    24 <li id="indicator/editors"            ><a href="javascript:requestPage('edit/indicator/editors',     '${selectedIndicatorName}')"   title="Set the editors.">Editors</a></li>
    25 </c:if>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/available_services.jsp

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

    r13313 r13315  
    33<%@ include file="../../_menu_items.jsp"%>
    44
    5 <%-- Need to have each page contain script to set the menu's " On" class. --%>
    6 <li id="indicator/list"  ><a href="javascript:requestPage('edit/indicator/list/${selectedIndicatorName}.html')" title="List of all your indicators.">Indicators List</a></li>
    7 <li id="indicator/detail"><a href="javascript:requestPage('edit/indicator/detail/${selectedIndicatorName}.html')" title="Title, definition, numerator, denominator, etc.">Indicator Detail</a></li>
    8 <li id="indicator/view/list"><a href="javascript:requestPage('edit/indicator/view/list/${selectedIndicatorName}.html')" title="views list">Views List</a></li>
     5<li>
     6        <input id ="ExpandableListInputControl.indicatorMenu" type="checkbox" title="Show/hide admin nav menu">
     7        <label for="ExpandableListInputControl.indicatorMenu" title="Admin user validation data maintenance.">Indicator Menu</label>
     8        <ul>
     9
     10<%@ include file="../_indicator_menu_items.jsp"%>
     11
     12        </ul>
     13</li>
     14
     15<li>
     16        <input id ="ExpandableListInputControl.indicatorDatasetMenu" type="checkbox" checked="checked" title="Show/hide admin nav menu">
     17        <label for="ExpandableListInputControl.indicatorDatasetMenu" title="Admin user validation data maintenance.">Datasets Sub Menu</label>
     18        <ul>
     19                <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>
     20                <li id="indicator/dataset/detail"><a href="javascript:requestPage('edit/indicator/dataset/detail',  '${selectedDatasetName}')" title="Datasets's definition -  textual info.">Dataset Detail</a></li>
     21                <li id="indicator/dataset/data_sources" class="MultiLine">
     22                        <a href="javascript:requestPage('edit/indicator/dataset/data_sources', '${selectedDatasetName}')"
     23                                title="Datasets's data sources."
     24                        >Dataset Data<br/> Sources</a>
     25                </li>
     26                <li id="indicator/dataset/dimensions"><a href="javascript:requestPage('edit/indicator/dataset/dimensions',   '${selectedDatasetName}')" title="Datasets's dimensions.">Dataset Dimensions</a></li>
     27                <li id="indicator/dataset/records"><a href="javascript:requestPage('edit/indicator/dataset/records', '${selectedDatasetName}')" title="Datasets's values, confidence limits etc.">Dataset Records</a></li>
     28        </ul>
     29</li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/data_sources.jsp

    r13314 r13315  
    7373                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7474                        <h2>Navigation Menu</h2>
    75                         <ul class="VerticalMenu ExpandableList RightControl">
     75                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
     76
    7677<%@ include file="_menu_items.jsp"%>
    77                                 <li class="SubList">
    78                                         <ul>
    79 <%@ include file="_sublist_menu_items.jsp"%>
    8078
    8179<c:if test="${(indicator != null) && indicator.statusOpen}">
    82                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    83                                                         <a href="javascript:requestPage('edit/indicator/dataset/data_sources/${dataset.name}.html')">Save</a>
    84                                                 </li>
    85                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    86                                                         <a href="javascript:confirmReset()">Reset</a>
    87                                                 </li>
     80                                <li id="saveButton" class="Button" title="Commit/save the changes">
     81                                        <a href="javascript:requestPage('edit/indicator/dataset/data_sources/${dataset.name}.html')">Save</a>
     82                                </li>
     83                                <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     84                                        <a href="javascript:confirmReset()">Reset</a>
     85                                </li>
    8886</c:if>
    89                                         </ul>
    90                                 </li>
    9187                        </ul>
    9288                </div>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/detail.jsp

    r13313 r13315  
    66<%@ include file="_ui_control.jsp"%>
    77
    8 <c:set var="pageTitle" value="Detail of the ${indicatorDataset.name} Indicator Dataset"/>
    9 <c:if test="${empty indicatorDataset.name}">
     8<c:set var="pageTitle" value="Detail of the ${dataset.name} Indicator Dataset"/>
     9<c:if test="${empty dataset.name}">
    1010        <c:set var="pageTitle" value="New Dataset for ${indicator.title}"/>
    1111</c:if>
     
    1616
    1717        <style>
    18                 #content
    19                 {
    20                         min-height: 630px;
    21                         min-width: 850px;
    22                 }
    2318                .TabbedContent
    2419                {
    2520                        min-height: 550px;
    26                 }
    27                 .TabbedContent .Tab > input:checked ~ .Container
    28                 {
    29                         width: 95%;
    3021                }
    3122        </style>
     
    10091                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    10192                        <h2>Navigation Menu</h2>
    102                         <ul class="VerticalMenu ExpandableList RightControl">
     93                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    10394
    10495<%@ include file="_menu_items.jsp"%>
    10596
    106                                 <li class="SubList">
    107                                         <ul>
    108 <%@ include file="_sublist_menu_items.jsp"%>
    10997<c:if test="${indicator.statusOpen}">
    110                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    111                                                         <a href="javascript:requestPage('edit/indicator/dataset/detail/${dataset.name}.html')">Save</a>
    112                                                 </li>
    113                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    114                                                         <a href="javascript:confirmReset()">Reset</a>
    115                                                 </li>
    116 </c:if>
    117                                         </ul>
     98                                <li id="saveButton" class="Button" title="Commit/save the changes">
     99                                        <a href="javascript:requestPage('edit/indicator/dataset/detail/${dataset.name}.html')">Save</a>
    118100                                </li>
     101                                <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     102                                        <a href="javascript:confirmReset()">Reset</a>
     103                                </li>
     104</c:if>
    119105                        </ul>
    120106                </div>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/dimensions.jsp

    r13314 r13315  
    8888                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    8989                        <h2>Navigation Menu</h2>
    90                         <ul class="VerticalMenu ExpandableList RightControl">
     90                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    9191
    9292<%@ include file="_menu_items.jsp"%>
    9393
    94                                 <li class="SubList">
    95                                         <ul>
    96 <%@ include file="_sublist_menu_items.jsp"%>
    9794<c:if test="${(dataset != null) && indicator.statusOpen}">
    98                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    99                                                         <a href="javascript:requestPage('edit/indicator/dataset/dimensions/${dataset.name}.html')">Save</a>
    100                                                 </li>
    101                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    102                                                         <a href="javascript:confirmReset()">Reset</a>
    103                                                 </li>
     95                                <li id="saveButton" class="Button" title="Commit/save the changes">
     96                                        <a href="javascript:requestPage('edit/indicator/dataset/dimensions/${dataset.name}.html')">Save</a>
     97                                </li>
     98                                <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     99                                        <a href="javascript:confirmReset()">Reset</a>
     100                                </li>
    104101</c:if>
    105                                         </ul>
    106                                 </li>
    107102                        </ul>
    108103                </div>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/list.jsp

    r13314 r13315  
    77
    88<c:set var="pageTitle" value="List of Defined Datasets for ${indicator.title}"/>
     9<c:set var="listPage"  value="true"/>
    910
    1011<head>
    1112
    1213<%@ include file="../../_head.jsp"%>
     14
     15        <style>
     16                #content
     17                {
     18                        min-height: 550px;
     19                }
     20        </style>
    1321
    1422        <script language="Javascript">
     
    4351                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4452                        <h2>Navigation Menu</h2>
    45                         <ul class="VerticalMenu ExpandableList RightControl">
     53                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    4654
    4755<%@ include file="_menu_items.jsp"%>
    4856
    49                                 <li class="SubList">
    50                                         <ul>
    51                                                 <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>
    52                                                 <li id="indicator/dataset/detail"><a href="javascript:requestPage('edit/indicator/dataset/detail', '${selectedDatasetName}')" title="Datasets's definition -  textual info.">Dataset Detail</a></li>
    53                                                 <li id="indicator/dataset/data_sources"><a href="javascript:requestPage('edit/indicator/dataset/data_sources', '${selectedDatasetName}')" title="Datasets's data sources.">Dataset Data Sources</a></li>
    54                                                 <li id="indicator/dataset/dimensions"  ><a href="javascript:requestPage('edit/indicator/dataset/dimensions','${selectedDatasetName}')" title="Datasets's dimensions.">Dataset Dimensions</a></li>
    55                                                 <li id="indicator/dataset/records"><a href="javascript:requestPage('edit/indicator/dataset/records', '${selectedDatasetName}')" title="Datasets's values, confidence limits etc.">Dataset Records</a></li>
     57                                <li id="editButton" class="Button" title="Edit the detail of the selected item">
     58                                        <a href="javascript:requestPage('edit/indicator/dataset/detail', '${selectedDatasetName}')">Edit Detail</a>
     59                                </li>
    5660<c:if test="${indicator.statusOpen}">
    5761        <c:if test="${userDetails.admin}">
    58                                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    59                                                         <a href="javascript:requestPage('edit/indicator/dataset/detail', '${selectedDatasetName}')">Edit Detail</a>
    60                                                 </li>
    61                                                 <li id="newButton" class="Button" title="Creates/adds a new item">
    62                                                         <a href="javascript:requestPage('edit/indicator/dataset/detail/-NEW-.html')">Add New</a>
     62                                <li id="newButton" class="Button" title="Creates/adds a new item">
     63                                        <a href="javascript:requestPage('edit/indicator/dataset/detail/-NEW-.html')">Add New</a>
    6364                                </li>
    64 
    6565        </c:if>
    66                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    67                                                         <a href="javascript:requestPage('edit/indicator/dataset/list/${selectedIndicatorName}.html')">Save</a>
    68                                                 </li>
    69                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    70                                                                         <a href="javascript:confirmReset()">Reset</a>
     66                                <li id="saveButton" class="Button" title="Commit/save the changes">
     67                                        <a href="javascript:requestPage('edit/indicator/dataset/list/${selectedIndicatorName}.html')">Save</a>
    7168                                </li>
    72 
     69                                <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     70                                        <a href="javascript:confirmReset()">Reset</a>
     71                                </li>
    7372<%--
    7473        <c:if test="${userDetails.admin}">
     
    7978--%>
    8079</c:if>
    81                                         </ul>
    82                                 </li>
    8380                        </ul>
    8481                </div>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/records.jsp

    r13314 r13315  
    1414        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/ModalDialog.css"/>
    1515        <style>
     16                #content
     17                {
     18                        min-height: 550px;
     19                }
    1620                #content form .ConstantDimensions select
    1721                {
     
    149153                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    150154                        <h2>Navigation Menu</h2>
    151                         <ul class="VerticalMenu ExpandableList RightControl">
     155                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    152156
    153157<%@ include file="_menu_items.jsp"%>
    154158
    155                                 <li class="SubList">
    156                                         <ul>
    157 
    158 <%@ include file="_sublist_menu_items.jsp"%>
    159159<%--
    160160<li id="indicator/dataset/record"><a href="javascript:requestPage('edit/indicator/dataset/record', '${selectedDatasetRecordKey}')" title="Datasets's record value, confidence limits etc.">Dataset Record Detail</a></li>
    161161--%>
    162                                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    163                                                         <a href="javascript:requestPage('edit/indicator/dataset/detail')">Edit Detail</a>
    164                                                 </li>
     162                                <li id="editButton" class="Button" title="Edit the detail of the selected item">
     163                                        <a href="javascript:requestPage('edit/indicator/dataset/detail')">Edit Detail</a>
     164                                </li>
    165165<c:if test="${(dataset != null) && indicator.statusOpen}">
    166                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    167                                                         <a href="javascript:requestPage('edit/indicator/dataset/records/${dataset.name}.html')">Save</a>
    168                                                 </li>
    169                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    170                                                         <a href="javascript:confirmReset()">Reset</a>
    171                                                 </li>
    172 </c:if>
    173                                         </ul>
     166                                <li id="saveButton" class="Button" title="Commit/save the changes">
     167                                        <a href="javascript:requestPage('edit/indicator/dataset/records/${dataset.name}.html')">Save</a>
    174168                                </li>
     169                                <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     170                                        <a href="javascript:confirmReset()">Reset</a>
     171                                </li>
     172</c:if>
    175173                        </ul>
    176174                </div>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/detail.jsp

    r13314 r13315  
    1515<head>
    1616        <style>
    17                 #content
    18                 {
    19                         min-height: 770px;
    20                         min-width:      875px;
    21                 }
    2217                .TabbedContent
    2318                {
     
    10095                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    10196                        <h2>Navigation Menu</h2>
    102                         <ul class="VerticalMenu ExpandableList RightControl">
     97                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    10398
    10499<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/editors.jsp

    r13314 r13315  
    4949                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    5050                        <h2>Navigation Menu</h2>
    51                         <ul class="VerticalMenu ExpandableList RightControl">
     51                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    5252
    5353<%@ include file="_menu_items.jsp"%>
     
    7676                                                        <input type="checkbox" name="userID" value="${user.ID}" ${indicatorEditor[user.ID] != null ? "checked=\"checked\"" : ""} ${onClick} ${checkboxControl}/>
    7777                                                </td>
    78                                                 <td class="Title">
     78                                                <td class="Name">
    7979<c:if test="${userDetails.admin}"><a href="javascript:requestPage('edit/user/detail/${user.ID}.html');"></c:if>
    8080                                                        ${user.ID}
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/footnote_references.jsp

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

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

    r13314 r13315  
    7575                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    7676                        <h2>Navigation Menu</h2>
    77                         <ul class="VerticalMenu ExpandableList RightControl">
     77                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    7878
    7979<%@ include file="_menu_items.jsp"%>
     
    149149                                                <td class="Name">
    150150                                                        <a name="${fn:substring(indicator.title,0,1)}" href="javascript:requestPage('edit/indicator/detail/${indicator.name}.html');" title="Detail / main text for ${indicator.name}">
    151                                                                 ${fn:substring(indicator.name, 0, 15)}
     151                                                                ${fn:substring(indicator.name, 0, 25)}
    152152                                                        </a>
    153153                                                </td>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/more_resources.jsp

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

    r13313 r13315  
    4141                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    4242                        <h2>Navigation Menu</h2>
    43                         <ul class="VerticalMenu ExpandableList RightControl">
     43                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    4444
    4545<%@ include file="_menu_items.jsp"%>
     
    6161                                        <tr>
    6262                                                <th scope="col" class="Selection" title="Controls which record is selected when editing associated detail.">Owner</th>
    63                                                 <th scope="col" class="list" width="150">User ID</th>
    64                                                 <th scope="col" class="list" width="150">Full Name</th>
    65                                                 <th scope="col" class="list" width="150">Organization</th>
     63                                                <th scope="col" class="Name">User ID</th>
     64                                                <th scope="col" class="Title" width="150">Full Name</th>
     65                                                <th scope="col" class="Name" width="150">Organization</th>
    6666                                        </tr>
    6767
     
    7171                                                        <input type="radio" name="userID" value="${user.ID}" ${indicator.ownerUserID == user.ID ? "checked=\"checked\"" : ""} ${onClick} ${radioControl}/>
    7272                                                </td>
    73                                                 <td class="Title">
     73                                                <td class="Name">
    7474<c:if test="${userDetails.admin}"><a href="javascript:requestPage('edit/user/detail/${user.ID}.html');"></c:if>
    7575                                                        ${user.ID}
     
    7777                                                </td>
    7878                                                <td class="Title" title="${user.ID}">${user.fullName}</td>
    79                                                 <td class="Title" title="${user.ID}">${user.organization}</td>
     79                                                <td class="Name" title="${user.ID}">${user.organization}</td>
    8080                                        </tr>
    8181</c:forEach>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/related_indicators.jsp

    r13313 r13315  
    132132                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    133133                        <h2>Navigation Menu</h2>
    134                         <ul class="VerticalMenu ExpandableList RightControl">
     134                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    135135
    136136<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/topics.jsp

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

    r13313 r13315  
    1111                <li id="indicator/view/datasets"><a href="javascript:requestPage('edit/indicator/view/datasets', '${selectedIndicatorViewName}')" title="Data view's datasets.">View's Datasets</a></li>
    1212                <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="LargeText"><a href="javascript:requestPage('edit/indicator/view/dimension/values', '${selectedIndicatorViewName}')" title="View's dimension values.">View's Dimension Values</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>
    1414                <li id="indicator/view/queries" ><a href="javascript:requestPage('edit/indicator/view/queries',  '${selectedIndicatorViewName}')" title="Edit saved query list.">View's Queries</a></li>
    1515</ul>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/_sublist_menu_items.jsp

    r13313 r13315  
    33        <li id="indicator/view/datasets"><a href="javascript:requestPage('edit/indicator/view/datasets', '${selectedIndicatorViewName}')" title="Data view's datasets.">View's Datasets</a></li>
    44        <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>
    5         <li id="indicator/view/dimension/values" class="LargeText"><a href="javascript:requestPage('edit/indicator/view/dimension/values', '${selectedIndicatorViewName}')" title="View's dimension values.">View's Dimension Values</a></li>
     5        <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>
    66        <li id="indicator/view/queries" ><a href="javascript:requestPage('edit/indicator/view/queries',  '${selectedIndicatorViewName}')" title="Edit saved query list.">View's Queries</a></li>
    77</c:if>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/datasets.jsp

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

    r13314 r13315  
    1616
    1717        <style>
    18                 #content
    19                 {
    20                         min-height:     630px;
    21                         min-width:      875px;
    22                 }
    2318                .TabbedContent
    2419                {
     
    9085                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    9186                        <h2>Navigation Menu</h2>
    92                         <ul class="VerticalMenu ExpandableList RightControl">
     87                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    9388
    9489<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/dimension_values.jsp

    r13313 r13315  
    1414        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/ModalDialog.css"/>
    1515        <style>
    16                 #content
    17                 {
    18                         min-height: 550px;
    19                 }
    2016                .TabbedContent
    2117                {
    2218                        min-height: 500px;
    23                 }
    24                 .TabbedContent .Tab > input:checked ~ .Container
    25                 {
    26                         width: 95%;
    2719                }
    2820        </style>
     
    8274                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    8375                        <h2>Navigation Menu</h2>
    84                         <ul class="VerticalMenu ExpandableList RightControl">
     76                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    8577
    8678<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/dimensions.jsp

    r13314 r13315  
    1313
    1414        <style>
    15                 #content
    16                 {
    17                         min-height: 550px;
    18                 }
    1915                .TabbedContent
    2016                {
    21                         height: 500px;
     17                        min-height: 600px;
    2218                }
    2319        </style>
     
    8581                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    8682                        <h2>Navigation Menu</h2>
    87                         <ul class="VerticalMenu ExpandableList RightControl">
     83                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    8884
    8985<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/list.jsp

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

    r13314 r13315  
    121121                        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    122122                        <h2>Navigation Menu</h2>
    123                         <ul class="VerticalMenu ExpandableList RightControl">
     123                        <ul class="VerticalMenu ExpandableList RightControl" id="navigationMenuList">
    124124
    125125<%@ include file="_menu_items.jsp"%>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/_menu_items.jsp

    r11351 r13315  
    33<%@ include file="../_menu_items.jsp"%>
    44
    5 <li id="initiative/list"      ><a href="javascript:requestPage('edit/initiative/list')"   title="List of">Initiative List</a></li>
    6 <li id="initiative/detail"    ><a href="javascript:requestPage('edit/initiative/detail',     '${selectedInitiativeName}')" title="Detail of">Initiative Detail</a></li>
    7 <li id="initiative/topic/list"><a href="javascript:requestPage('edit/initiative/topic/list', '${selectedInitiativeName}')" title="view associated initiative topics">Initiative Topic List</a></li>
     5<li id="initiative/list"  ><a href="javascript:requestPage('edit/initiative/list')" title="List of">Initiative List</a></li>
     6<li id="initiative/detail"><a href="javascript:requestPage('edit/initiative/detail', '${selectedInitiativeName}')" title="Detail of">Initiative Detail</a></li>
     7<li id="initiative/topic/list" class="MultiLine">
     8        <a href="javascript:requestPage('edit/initiative/topic/list', '${selectedInitiativeName}')"
     9                title="view associated initiative topics"
     10        >Initiative Topic<br/> List</a>
     11</li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/detail.jsp

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

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

    r11351 r13315  
    33<%@ include file="../_menu_items.jsp"%>
    44
    5 <li id="initiative/topic/detail"        ><a href="javascript:requestPage('edit/initiative/topic/detail',         '${selectedInitiativeTopicName}')" title="view associated initiative topic detail">Initiative Topic Detail</a></li>
    6 <li id="initiative/topic/objective/list"><a href="javascript:requestPage('edit/initiative/topic/objective/list', '${selectedInitiativeTopicName}')" title="view associated initiative topic objective detail">Initiative Topic Objective List</a></li>
     5<li id="initiative/topic/detail" class="MultiLine">
     6        <a href="javascript:requestPage('edit/initiative/topic/detail', '${selectedInitiativeTopicName}')"
     7                title="view associated initiative topic detail"
     8        >Initiative Topic<br/> Detail</a>
     9</li>
     10<li id="initiative/topic/objective/list" class="MultiLine">
     11        <a href="javascript:requestPage('edit/initiative/topic/objective/list', '${selectedInitiativeTopicName}')"
     12                title="view associated initiative topic objective detail"
     13        >Initiative Topic<br/> Objective List</a>
     14</li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/detail.jsp

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

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

    r11351 r13315  
    33<%@ include file="../_menu_items.jsp"%>
    44
    5 <li id="initiative/topic/objective/detail" title="view associated initiative topic objective detail">
    6         <a href="javascript:requestPage('edit/initiative/topic/objective/detail', '${selectedInitiativeTopicObjectiveName}')">Initiative Topic Objective Detail</a>
     5<li id="initiative/topic/objective/detail" class="MultiLine" title="view associated initiative topic objective detail">
     6        <a href="javascript:requestPage('edit/initiative/topic/objective/detail', '${selectedInitiativeTopicObjectiveName}')">
     7                Initiative Topic<br/> Objective Detail
     8        </a>
    79</li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/objective/detail.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    r11346 r13315  
    33<%@ include file="../_menu_items.jsp"%>
    44
    5 <li id="value_attribute/list"  ><a href="javascript:requestPage('edit/value_attribute/list')"   title="List of">Value Attribute List</a></li>
    6 <li id="value_attribute/detail"><a href="javascript:requestPage('edit/value_attribute/detail')" title="Detail of">Value Attribute Detail</a></li>
     5<li id="value_attribute/list"  class="MultiLine">
     6        <a href="javascript:requestPage('edit/value_attribute/list')"   
     7                title="List of"
     8        >Value Attribute<br/> List</a>
     9</li>
     10<li id="value_attribute/detail" class="MultiLine">
     11        <a href="javascript:requestPage('edit/value_attribute/detail')"
     12                title="Detail of"
     13        >Value Attribute<br/> Detail</a>
     14</li>
    715
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_attribute/detail.jsp

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

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

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

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

    r13314 r13315  
    9595        padding:                        0;
    9696        margin:                         0;
    97 /*      width:                          100%;
    9897        min-height:                     400px;
    99         overflow:                       hidden;
    100 */
     98
    10199        -moz-border-radius:        6px 0px 6px 6px; 
    102100        -webkit-border-radius: 6px 0px 6px 6px; 
     
    125123}
    126124
     125#navigationMenu #navigationMenuList
     126{
     127        position:                       absolute;
     128        top:                            0;
     129}
     130
    127131
    128132#navigationMenu .VerticalMenu
     
    143147        border-top:                     1px solid white;
    144148
    145         -moz-border-radius:     0px 5px 5px 0px; 
    146         -webkit-border-radius: 0px 5px 5px 0px; 
    147         border-radius:          0px 5px 5px 0px; 
    148 
    149149        -moz-box-shadow:        none;
    150150        -webkit-box-shadow: none;
     
    155155#navigationMenu ul li:focus
    156156{
    157         background-color:       #225588;
    158 }
    159 
    160 /* NOTE: Used lesser specific selector rules to avoid total redefine */
    161 #navigationMenu li.On   
    162 {
    163         background-color:       #88bbee;
     157        background-color:       #003366;
    164158}
    165159
     
    171165        display:                        block;
    172166}
    173 #navigationMenu ul li a:hover
     167#navigationMenu ul li a:hover,
     168#navigationMenu .VerticalMenu li ul li a:hover
    174169{
    175170        color:  #ffcc66;
    176         -moz-border-radius:     0px 5px 5px 0px; 
    177         -webkit-border-radius: 0px 5px 5px 0px; 
    178         border-radius:          0px 5px 5px 0px; 
    179 }
    180 #navigationMenu > ul li.LargeText > a
     171}
     172#navigationMenu li.MultiLine > a
    181173{
    182174        padding-top:             8px;
    183175}
    184176
     177#navigationMenu li.On   
     178{
     179        background-color:       #88bbee;
     180}
    185181#navigationMenu li.On > a
    186182{
     
    191187
    192188/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ S U B   M E N U */
    193 
     189#navigationMenu .VerticalMenu li ul li
     190{
     191        background-color: white;
     192}
     193#navigationMenu .VerticalMenu li ul li
     194{
     195        border-top:                     1px solid #336699;
     196}
     197
     198#navigationMenu .VerticalMenu li ul li label,
     199#navigationMenu .VerticalMenu li ul li a
     200{
     201        color:                          #003366;
     202}
     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;
     209        border-top:                     1px solid #eee;
     210}
     211
     212#navigationMenu .VerticalMenu li ul li.On       
     213{
     214        background-color:       #ddeeff;
     215}
    194216
    195217/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ M E N U    B U T T O N S */
     
    264286#content .Sections .Header
    265287{
    266         padding:                        0.2em 5px 0 3px;
     288        padding:                        0.2em 5px 2px 3px;
    267289        border:                         none;
    268290}
  • trunk/ibisph-admin/src/main/webapp/css/_table.css

    r13314 r13315  
    200200
    201201table.Detail input#footnoteCode {width:                         7em;}
    202 table.Detail input#sortOrder    {width:                         4em;}
     202table.Detail input#sortOrder   
     203{
     204        width:                          4em;
     205        min-width:                      4em;
     206}
    203207table.Detail .ActiveFlag input  { margin-left:3px; }
    204208
  • trunk/ibisph-admin/src/main/webapp/js/common.js

    r13106 r13315  
    6060/**
    6161 * Main method that should be used for all webapp navigation requests.  This
    62  * function is required to be executed for all pages so that any modified data
    63  * can be saved even if the save button was not pressed first.  If the form
    64  * was modified (and its fields are valid) then need to post changes back to
    65  * the server and then redirect/forward to the requested page.  This function
    66  * tests for modified, if valid, and then sets the hidden input element named
    67  * "pageName" (which should be on the page) to the supplied pageRequestURL value. 
    68  * The server's controller will then save the posted content and get the URL
    69  * value contained in the pageName request parameter.  The controller then does
    70  * a redirect to that URL (redirect avoids forward's dup posting problem when
    71  * the back button is pressed). 
    72  *
    73  * 3 Use cases:
    74  * 1) Complete URL/direct request.  This is when the URL ends with ".html".  It
     62 * function is required to be executed for all pages so that:
     63 * a) any modified data can be saved even if the save button was not pressed
     64 *      first.  If the form was modified (and its fields are valid) then need to post
     65 *      changes back to the server and then redirect/forward to the requested page. 
     66 *      This function tests for modified, if valid, and then sets the hidden input
     67 *      element named "pageName" (which should be on the page) to the supplied
     68 *      pageRequestURL value. 
     69 *      The server's controller will then save the posted content and get the URL
     70 *      value contained in the pageName request parameter.  The controller then does
     71 *      a redirect to that URL (redirect avoids forward's dup posting problem when
     72 *      the back button is pressed). 
     73 * b) list page's requested "selectedName" are handled.
     74 *       3 Use cases:
     75 *       1) Complete URL/direct request.  This is when the URL ends with ".html".  It
    7576 *    is almost always used by a list page's detail page request link.
    7677 *    NOTE: If a selectedName element exists, then the name needs to be grabbed
    7778 *    from the end of the URL request and set.
    78  * 2) Left nav tab request - page has a selectedName element (list pages). Always
     79 *      2) Left nav tab request - page has a selectedName element (list pages). Always
    7980 *    use the page's selectedName if it exists (unless it is complete URL).  The
    8081 *    URL is built by the components of prefix, base URL, selectedName, .html. 
    81  * 3) Left nav tab request - no selectedName element (non list detail pages). 
     82 *      3) Left nav tab request - no selectedName element (non list detail pages). 
    8283 *    Use the supplied selectedName parameter value to build the complete URL.
    8384 *    Note that most pages (not IP or IPV) do not even need a value as the
     
    8788 *    IP/IPV is displayed (different way of creating a "new" IP).
    8889 *
    89  *@param pageRequestURL relative request url associated with the desired page.
     90 
     91 *@param url complete URL.
    9092 *@param optionalURLModifierArgument arg that is passed to the URL modifier. 
    9193 *   This allows the modifier to do special checks etc.
Note: See TracChangeset for help on using the changeset viewer.