Changeset 13329 in main


Ignore:
Timestamp:
03/07/17 23:33:39 (5 years ago)
Author:
Garth Braithwaite
Message:

admin - Temp commit of JSPs - mostly done with reworking includes.

Location:
trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp
Files:
1 deleted
75 edited
1 moved

Legend:

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

    r13328 r13329  
    5555--%>
    5656
     57
     58
     59<div id="navigationMenu">
     60        <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
     61        <h2>Navigation Menu</h2>
     62        <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
     63
    5764<c:if test="${userDetails.admin}">
    58 <li>
    59         <input id ="ExpandableListInputControl.navigationMenu" type="checkbox" title="Show/hide admin nav menu">
    60         <label for="ExpandableListInputControl.navigationMenu" title="Admin user validation data maintenance.">Admin Menu</label>
    61         <ul>
    62                 <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                <li>
     66                        <input id ="ExpandableListInputControl.navigationMenu" type="checkbox" title="Show/hide admin nav menu">
     67                        <label for="ExpandableListInputControl.navigationMenu" title="Admin user validation data maintenance.">Admin Menu</label>
     68                        <ul>
     69                                <li><a href="javascript:requestPage('edit/indicator/list')"   title="Show the Main Indicator List page">Indicators</a></li>
     70                                <li><a href="javascript:requestPage('edit/topic/list')"       title="Show the Topic list page">Topics</a></li>
     71                                <li><a href="javascript:requestPage('edit/initiative/list')"  title="Show the initiative list page">Initiative Objectives</a></li>
    6572
    66                 <li><a href="javascript:requestPage('edit/data_source/list')" title="Show the Data Sources list page">Data Sources</a></li>
    67                 <li><a href="javascript:requestPage('edit/dimension/list')"   title="Show the Dimension list page">Dimensions</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_type/list')"  title="Show the Value Type list page">Value Types</a></li>
    70                 <li><a href="javascript:requestPage('edit/value_attribute/list')" title="Show the value attribute list page">Value Attributes</a></li>
    71                 <li><a href="javascript:requestPage('edit/ancillary_value/list')" title="Show the ancillary value definition list page">Ancillary Values</a></li>
     73                                <li><a href="javascript:requestPage('edit/data_source/list')" title="Show the Data Sources list page">Data Sources</a></li>
     74                                <li><a href="javascript:requestPage('edit/dimension/list')"   title="Show the Dimension list page">Dimensions</a></li>
     75                                <li><a href="javascript:requestPage('edit/measure/list')"     title="Show the Measure list page">Measures</a></li>
     76                                <li><a href="javascript:requestPage('edit/value_type/list')"  title="Show the Value Type list page">Value Types</a></li>
     77                                <li><a href="javascript:requestPage('edit/value_attribute/list')" title="Show the value attribute list page">Value Attributes</a></li>
     78                                <li><a href="javascript:requestPage('edit/ancillary_value/list')" title="Show the ancillary value definition list page">Ancillary Values</a></li>
    7279
    73                 <li><a href="javascript:requestPage('edit/chart/list')"       title="Show the Chart list page">Charts</a></li>
    74                 <li><a href="javascript:requestPage('edit/map/list')"         title="Show the Map list page">Maps</a></li>
     80                                <li><a href="javascript:requestPage('edit/chart/list')"       title="Show the Chart list page">Charts</a></li>
     81                                <li><a href="javascript:requestPage('edit/map/list')"         title="Show the Map list page">Maps</a></li>
    7582
    76                 <li><a href="javascript:requestPage('edit/authority/list')"   title="Show the Authority list page">Authorities</a></li>
    77                 <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>
    79 <!--
    80                 <li id="system/command"><a href="javascript:requestPage('edit/system/command.html')" title="Show the Reposiory Publishing page">Run Command (deployment scripts)</a></li>
    81 -->
     83                                <li><a href="javascript:requestPage('edit/authority/list')"   title="Show the Authority list page">Authorities</a></li>
     84                                <li><a href="javascript:requestPage('edit/user/list')"        title="Show the User list page">Users</a></li>
     85                                <li><a href="javascript:requestPage('edit/org_unit/list')"    title="Show the Org Unit list page">Org Units</a></li>
     86                <!--
     87                                <li id="system/command"><a href="javascript:requestPage('edit/system/command.html')" title="Show the Reposiory Publishing page">Run Command (deployment scripts)</a></li>
     88                -->
     89                        </ul>
     90                </li>
     91</c:if>
     92
     93${navigationMenuContextItems}
     94
    8295        </ul>
    83 </li>
    84 </c:if>
     96</div>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/ancillary_value/_menu_items.jsp

    r13315 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="ancillary_value/list" class="MultiLine">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/ancillary_value/detail.jsp

    r13328 r13329  
    4141        <div id="content">
    4242
    43                 <div id="navigationMenu">
    44                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    45                         <h2>Navigation Menu</h2>
    46                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    47 
    48 <%@ include file="_menu_items.jsp"%>
    49 
    50                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    51                                         <a href="javascript:requestPage('edit/ancillary_value/detail')">Save</a>
    52                                 </li>
    53                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    54                                         <a href="javascript:confirmReset()">Reset</a>
    55                                 </li>
    56                         </ul>
    57                 </div>
     43<c:set var="navigationMenuContextItems">
     44        <%@ include file="_menu_items.jsp"%>
     45        <li id="saveButton" class="Button" title="Commit/save the changes">
     46                <a href="javascript:requestPage('edit/ancillary_value/detail')">Save</a>
     47        </li>
     48        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     49                <a href="javascript:confirmReset()">Reset</a>
     50        </li>
     51</c:set>
     52<%@ include file="../_navigation_menu.jsp"%>
    5853
    5954                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/ancillary_value/list.jsp

    r13328 r13329  
    7171        <div id="content">
    7272
    73                 <div id="navigationMenu">
    74                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    75                         <h2>Navigation Menu</h2>
    76                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    77 
    78 <%@ include file="_menu_items.jsp"%>
    79 
    80                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    81                                         <a href="javascript:requestPage('edit/ancillary_value/detail')">Edit Detail</a>
    82                                 </li>
    83                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    84                                         <a href="javascript:requestPage('edit/ancillary_value/list')">Save</a>
    85                                 </li>
    86                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    87                                         <a href="javascript:confirmReset()">Reset</a>
    88                                 </li>
     73<c:set var="navigationMenuContextItems">
     74        <%@ include file="_menu_items.jsp"%>
     75        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     76                <a href="javascript:requestPage('edit/ancillary_value/detail')">Edit Detail</a>
     77        </li>
     78        <li id="saveButton" class="Button" title="Commit/save the changes">
     79                <a href="javascript:requestPage('edit/ancillary_value/list')">Save</a>
     80        </li>
     81        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     82                <a href="javascript:confirmReset()">Reset</a>
     83        </li>
    8984<!--
    90                                 <li id="deleteButton" class="Button Show" title="Delete this record">
    91                                         <a href="javascript:confirmDelete('delete/title/list')">Delete</a>
    92                                 </li>
     85        <li id="deleteButton" class="Button Show" title="Delete this record">
     86                <a href="javascript:confirmDelete('delete/title/list')">Delete</a>
     87        </li>
    9388-->
    94                         </ul>
    95                 </div>
     89</c:set>
     90<%@ include file="../_navigation_menu.jsp"%>
    9691
    9792                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/authority/_menu_items.jsp

    r11346 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="authority/list"  ><a href="javascript:requestPage('edit/authority/list')"   title="List of">Authority List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/authority/detail.jsp

    r13328 r13329  
    4141        <div id="content">
    4242
    43                 <div id="navigationMenu">
    44                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    45                         <h2>Navigation Menu</h2>
    46                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    47 
    48 <%@ include file="_menu_items.jsp"%>
    49 
    50                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    51                                         <a href="javascript:requestPage('edit/authority/detail')">Save</a>
    52                                 </li>
    53                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    54                                                         <a href="javascript:confirmReset()">Reset</a>
    55                                 </li>
     43<c:set var="navigationMenuContextItems">
     44        <%@ include file="_menu_items.jsp"%>
     45        <li id="saveButton" class="Button" title="Commit/save the changes">
     46                <a href="javascript:requestPage('edit/authority/detail')">Save</a>
     47        </li>
     48        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     49                                <a href="javascript:confirmReset()">Reset</a>
     50        </li>
    5651<%--
    57                                 <li id="deleteButton" class="Button" title="Delete this record">
    58                                                         <a href="javascript:confirmDelete('view/authority/detail_DELETE')">Delete</a>
    59                                 </li>
     52        <li id="deleteButton" class="Button" title="Delete this record">
     53                                <a href="javascript:confirmDelete('view/authority/detail_DELETE')">Delete</a>
     54        </li>
    6055--%>
    61                         </ul>
    62                 </div>
     56</c:set>
     57<%@ include file="../_navigation_menu.jsp"%>
    6358
    6459                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/authority/list.jsp

    r13328 r13329  
    5959        <div id="content">
    6060
    61                 <div id="navigationMenu">
    62                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    63                         <h2>Navigation Menu</h2>
    64                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    65 
    66 <%@ include file="_menu_items.jsp"%>
    67 
    68                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    69                                         <a href="javascript:requestPage('edit/authority/detail')">Edit Detail</a>
    70                                 </li>
    71                                 <li id="newButton" class="Button" title="Creates/adds a new item">
    72                                         <a href="javascript:requestPage('edit/authority/detail/-NEW-.html')">Add New</a>
    73                                 </li>
    74                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    75                                         <a href="javascript:requestPage('edit/authority/list')">Save</a>
    76                                 </li>
    77                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    78                                                         <a href="javascript:confirmReset()">Reset</a>
    79                                 </li>
    80                         </ul>
    81                 </div>
     61<c:set var="navigationMenuContextItems">
     62        <%@ include file="_menu_items.jsp"%>
     63        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     64                <a href="javascript:requestPage('edit/authority/detail')">Edit Detail</a>
     65        </li>
     66        <li id="newButton" class="Button" title="Creates/adds a new item">
     67                <a href="javascript:requestPage('edit/authority/detail/-NEW-.html')">Add New</a>
     68        </li>
     69        <li id="saveButton" class="Button" title="Commit/save the changes">
     70                <a href="javascript:requestPage('edit/authority/list')">Save</a>
     71        </li>
     72        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     73                                <a href="javascript:confirmReset()">Reset</a>
     74        </li>
     75</c:set>
     76<%@ include file="../_navigation_menu.jsp"%>
    8277
    8378                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/chart/_menu_items.jsp

    r11346 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="chart/list"  ><a href="javascript:requestPage('edit/chart/list')"   title="List of">Chart List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/chart/detail.jsp

    r13328 r13329  
    4141        <div id="content">
    4242
    43                 <div id="navigationMenu">
    44                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    45                         <h2>Navigation Menu</h2>
    46                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    47 
    48 <%@ include file="_menu_items.jsp"%>
    49 
    50                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    51                                         <a href="javascript:requestPage('edit/chart/detail')">Save</a>
    52                                 </li>
    53                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    54                                                         <a href="javascript:confirmReset()">Reset</a>
    55                                 </li>
     43<c:set var="navigationMenuContextItems">
     44        <%@ include file="_menu_items.jsp"%>
     45        <li id="saveButton" class="Button" title="Commit/save the changes">
     46                <a href="javascript:requestPage('edit/chart/detail')">Save</a>
     47        </li>
     48        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     49                <a href="javascript:confirmReset()">Reset</a>
     50        </li>
    5651<%--
    57                                 <li id="deleteButton" class="Button" title="Delete this record">
    58                                                         <a href="javascript:confirmDelete('view/chart/detail_DELETE')">Delete</a>
    59                                 </li>
     52        <li id="deleteButton" class="Button" title="Delete this record">
     53                <a href="javascript:confirmDelete('view/chart/detail_DELETE')">Delete</a>
     54        </li>
    6055--%>
    61                         </ul>
    62                 </div>
     56</c:set>
     57<%@ include file="../_navigation_menu.jsp"%>
    6358
    6459                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/chart/list.jsp

    r13328 r13329  
    7070        <div id="content">
    7171
    72                 <div id="navigationMenu">
    73                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    74                         <h2>Navigation Menu</h2>
     72<c:set var="navigationMenuContextItems">
     73        <%@ include file="_menu_items.jsp"%>
     74        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     75                <a href="javascript:requestPage('edit/chart/detail')">Edit Detail</a>
     76        </li>
    7577<!--
    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">
    89 
    90 <%@ include file="_menu_items.jsp"%>
    91 
    92                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    93                                         <a href="javascript:requestPage('edit/chart/detail')">Edit Detail</a>
    94                                 </li>
    95 <!--
    96                                 <li id="newButton" class="Button" title="Creates/adds a new item">
    97                                         <a href="javascript:requestPage('edit/chart/detail/-NEW-.html')">Add New</a>
    98                                 </li>
     78        <li id="newButton" class="Button" title="Creates/adds a new item">
     79                <a href="javascript:requestPage('edit/chart/detail/-NEW-.html')">Add New</a>
     80        </li>
    9981-->
    100                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    101                                         <a href="javascript:requestPage('edit/chart/list')">Save</a>
    102                                 </li>
    103                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    104                                                         <a href="javascript:confirmReset()">Reset</a>
    105                                 </li>
    106                         </ul>
    107                 </div>
     82        <li id="saveButton" class="Button" title="Commit/save the changes">
     83                <a href="javascript:requestPage('edit/chart/list')">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>
     88</c:set>
     89<%@ include file="../_navigation_menu.jsp"%>
    10890
    10991                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/data_source/_menu_items.jsp

    r11346 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="data_source/list"  ><a href="javascript:requestPage('edit/data_source/list')"   title="List of">Data Source List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/data_source/detail.jsp

    r13328 r13329  
    5151        <div id="content">
    5252
    53                 <div id="navigationMenu">
    54                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    55                         <h2>Navigation Menu</h2>
    56                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    57 
    58 <%@ include file="_menu_items.jsp"%>
    59 
    60                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    61                                         <a href="javascript:requestPage('edit/data_source/detail')">Save</a>
    62                                 </li>
    63                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    64                                                         <a href="javascript:confirmReset()">Reset</a>
    65                                 </li>
     53<c:set var="navigationMenuContextItems">
     54        <%@ include file="_menu_items.jsp"%>
     55        <li id="saveButton" class="Button" title="Commit/save the changes">
     56                <a href="javascript:requestPage('edit/data_source/detail')">Save</a>
     57        </li>
     58        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     59                <a href="javascript:confirmReset()">Reset</a>
     60        </li>
    6661<%--
    67                                 <li id="deleteButton" class="Button" title="Delete this record">
    68                                                         <a href="javascript:confirmDelete('delete/data_source/detail/${dataSoucrce.name}.html')">Delete</a>
    69                                 </li>
     62        <li id="deleteButton" class="Button" title="Delete this record">
     63                <a href="javascript:confirmDelete('delete/data_source/detail/${dataSoucrce.name}.html')">Delete</a>
     64        </li>
    7065--%>
    71                         </ul>
    72                 </div>
     66</c:set>
     67<%@ include file="../_navigation_menu.jsp"%>
    7368
    7469                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/data_source/list.jsp

    r13328 r13329  
    8080        <div id="content">
    8181
    82                 <div id="navigationMenu">
    83                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    84                         <h2>Navigation Menu</h2>
    85                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    86 
    87 <%@ include file="_menu_items.jsp"%>
    88 
    89                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    90                                         <a href="javascript:requestPage('edit/data_source/detail')">Edit Detail</a>
    91                                 </li>
    92                                 <li id="newButton" class="Button" title="Creates/adds a new item">
    93                                         <a href="javascript:requestPage('edit/data_source/detail/-NEW-.html')">Add New</a>
    94                                 </li>
    95                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    96                                         <a href="javascript:requestPage('edit/data_source/list')">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>
    101                         </ul>
    102                 </div>
     82<c:set var="navigationMenuContextItems">
     83        <%@ include file="_menu_items.jsp"%>
     84        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     85                <a href="javascript:requestPage('edit/data_source/detail')">Edit Detail</a>
     86        </li>
     87        <li id="newButton" class="Button" title="Creates/adds a new item">
     88                <a href="javascript:requestPage('edit/data_source/detail/-NEW-.html')">Add New</a>
     89        </li>
     90        <li id="saveButton" class="Button" title="Commit/save the changes">
     91                <a href="javascript:requestPage('edit/data_source/list')">Save</a>
     92        </li>
     93        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     94                <a href="javascript:confirmReset()">Reset</a>
     95        </li>
     96</c:set>
     97<%@ include file="../_navigation_menu.jsp"%>
    10398
    10499                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/dimension/_menu_items.jsp

    r11346 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="dimension/list"  ><a href="javascript:requestPage('edit/dimension/list')"   title="List of">Dimension List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/dimension/detail.jsp

    r13328 r13329  
    6363        <div id="content">
    6464
    65                 <div id="navigationMenu">
    66                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    67                         <h2>Navigation Menu</h2>
    68                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    69 
    70 <%@ include file="_menu_items.jsp"%>
    71 
    72                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    73                                         <a href="javascript:requestPage('edit/dimension/detail')">Save</a>
    74                                 </li>
    75                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    76                                                         <a href="javascript:confirmReset()">Reset</a>
    77                                 </li>
    78 <%--
    79                                 <li id="deleteButton" class="Button" title="Delete this record">
    80                                                         <a href="javascript:confirmDelete('delete/dimension/detail')">Delete</a>
    81                                 </li>
    82 --%>
    83                         </ul>
    84                 </div>
     65<c:set var="navigationMenuContextItems">
     66        <%@ include file="_menu_items.jsp"%>
     67        <li id="saveButton" class="Button" title="Commit/save the changes">
     68                <a href="javascript:requestPage('edit/dimension/detail')">Save</a>
     69        </li>
     70        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     71                <a href="javascript:confirmReset()">Reset</a>
     72        </li>
     73<%--
     74        <li id="deleteButton" class="Button" title="Delete this record">
     75                <a href="javascript:confirmDelete('delete/dimension/detail')">Delete</a>
     76        </li>
     77--%>
     78</c:set>
     79<%@ include file="../_navigation_menu.jsp"%>
    8580
    8681                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/dimension/list.jsp

    r13328 r13329  
    5757        <div id="content">
    5858
    59                 <div id="navigationMenu">
    60                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    61                         <h2>Navigation Menu</h2>
    62                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    63 
    64 <%@ include file="_menu_items.jsp"%>
    65 
    66                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    67                                         <a href="javascript:requestPage('edit/dimension/detail')">Edit Detail</a>
    68                                 </li>
    69                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    70                                         <a href="javascript:requestPage('edit/dimension/list')">Save</a>
    71                                 </li>
    72                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    73                                                         <a href="javascript:confirmReset()">Reset</a>
    74                                 </li>
    75                         </ul>
    76                 </div>
     59<c:set var="navigationMenuContextItems">
     60        <%@ include file="_menu_items.jsp"%>
     61        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     62                <a href="javascript:requestPage('edit/dimension/detail')">Edit Detail</a>
     63        </li>
     64        <li id="saveButton" class="Button" title="Commit/save the changes">
     65                <a href="javascript:requestPage('edit/dimension/list')">Save</a>
     66        </li>
     67        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     68                <a href="javascript:confirmReset()">Reset</a>
     69        </li>
     70</c:set>
     71<%@ include file="../_navigation_menu.jsp"%>
    7772
    7873                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/dimension/values.jsp

    r13328 r13329  
    7474        <div id="content">
    7575
    76                 <div id="navigationMenu">
    77                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    78                         <h2>Navigation Menu</h2>
    79                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    80 
    81 <%@ include file="_menu_items.jsp"%>
    82 
    83                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    84                                         <a href="javascript:requestPage('edit/dimension/values')">Save</a>
    85                                 </li>
    86                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    87                                                         <a href="javascript:confirmReset()">Reset</a>
    88                                 </li>
    89                         </ul>
    90                 </div>
     76<c:set var="navigationMenuContextItems">
     77        <%@ include file="_menu_items.jsp"%>
     78        <li id="saveButton" class="Button" title="Commit/save the changes">
     79                <a href="javascript:requestPage('edit/dimension/values')">Save</a>
     80        </li>
     81        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     82                <a href="javascript:confirmReset()">Reset</a>
     83        </li>
     84</c:set>
     85<%@ include file="../_navigation_menu.jsp"%>
    9186
    9287                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/_menu_items.jsp

    r13328 r13329  
    1111</c:set>
    1212
    13 <%@ include file="../_menu_items.jsp"%>
    1413<%@ include file="_indicator_menu_items.jsp"%>
    1514
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/available_services.jsp

    r13328 r13329  
    3131        <div id="content">
    3232
    33                 <div id="navigationMenu">
    34                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    35                         <h2>Navigation Menu</h2>
    36                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    37 
    38 <%@ include file="_menu_items.jsp"%>
    39 
    40                                 <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
    41                                                         <a href="javascript:showPreviewPage('preview/indicator/available_services/${indicator.name}.html')">Preview</a>
    42                                 </li>
    43 <c:if test="${indicator.statusOpen}">
    44                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    45                                         <a href="javascript:requestPage('edit/indicator/available_services/${indicator.name}.html')">Save</a>
    46                                 </li>
    47                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    48                                                         <a href="javascript:confirmReset()">Reset</a>
    49                                 </li>
    50 </c:if>
    51                         </ul>
    52                 </div>
     33<c:set var="navigationMenuContextItems">
     34        <%@ include file="_menu_items.jsp"%>
     35        <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
     36                <a href="javascript:showPreviewPage('preview/indicator/available_services/${indicator.name}.html')">Preview</a>
     37        </li>
     38        <c:if test="${indicator.statusOpen}">
     39        <li id="saveButton" class="Button" title="Commit/save the changes">
     40                <a href="javascript:requestPage('edit/indicator/available_services/${indicator.name}.html')">Save</a>
     41        </li>
     42        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     43                <a href="javascript:confirmReset()">Reset</a>
     44        </li>
     45        </c:if>
     46</c:set>
     47<%@ include file="../_navigation_menu.jsp"%>
    5348
    5449                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/_ui_control.jsp

    r11764 r13329  
    1 <c:set var="inputControl"   >readonly="true"</c:set>
    2 <c:set var="checkboxControl">onclick="return(false);" disabled</c:set>
    3 <c:set var="selectControl"  >onclick="return(false);" disabled</c:set>
    4 <c:set var="radioControl"   >onclick="return(false);" disabled onfocus="this.blur()"</c:set>
    5 
    6 <c:set var="onChange"></c:set>
    7 <c:set var="onClick" ></c:set>
     1<%@ include file="../_ui_control.jsp"%>
    82
    93<c:if test="${(indicator != null) && (dataset != null) && indicator.statusOpen}">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/data_sources.jsp

    r13328 r13329  
    7070        <div id="content">
    7171
    72                 <div id="navigationMenu">
    73                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    74                         <h2>Navigation Menu</h2>
    75                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
     72<c:set var="navigationMenuContextItems">
     73        <%@ include file="_menu_items.jsp"%>
     74        <c:if test="${(indicator != null) && indicator.statusOpen}">
     75        <li id="saveButton" class="Button" title="Commit/save the changes">
     76                <a href="javascript:requestPage('edit/indicator/dataset/data_sources/${dataset.name}.html')">Save</a>
     77        </li>
     78        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     79                <a href="javascript:confirmReset()">Reset</a>
     80        </li>
     81        </c:if>
     82</c:set>
     83<%@ include file="../../_navigation_menu.jsp"%>
    7684
    77 <%@ include file="_menu_items.jsp"%>
    78 
    79 <c:if test="${(indicator != null) && indicator.statusOpen}">
    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>
    86 </c:if>
    87                         </ul>
    88                 </div>
    89  
    9085                <div class="Sections">
    9186                        <form name="form" method="post" action="${pageContext.request.contextPath}/save/indicator/dataset/data_sources">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/detail.jsp

    r13328 r13329  
    8888        <div id="content">
    8989
    90                 <div id="navigationMenu">
    91                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    92                         <h2>Navigation Menu</h2>
    93                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    94 
    95 <%@ include file="_menu_items.jsp"%>
    96 
    97 <c:if test="${indicator.statusOpen}">
    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>
    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>
    104 </c:if>
    105                         </ul>
    106                 </div>
     90<c:set var="navigationMenuContextItems">
     91        <%@ include file="_menu_items.jsp"%>
     92        <c:if test="${indicator.statusOpen}">
     93        <li id="saveButton" class="Button" title="Commit/save the changes">
     94                <a href="javascript:requestPage('edit/indicator/dataset/detail/${dataset.name}.html')">Save</a>
     95        </li>
     96        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     97                <a href="javascript:confirmReset()">Reset</a>
     98        </li>
     99        </c:if>
     100</c:set>
     101<%@ include file="../../_navigation_menu.jsp"%>
    107102
    108103                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/dimensions.jsp

    r13328 r13329  
    8585        <div id="content">
    8686
    87                 <div id="navigationMenu">
    88                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    89                         <h2>Navigation Menu</h2>
    90                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    91 
    92 <%@ include file="_menu_items.jsp"%>
    93 
    94 <c:if test="${(dataset != null) && indicator.statusOpen}">
    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>
    101 </c:if>
    102                         </ul>
    103                 </div>
     87<c:set var="navigationMenuContextItems">
     88        <%@ include file="_menu_items.jsp"%>
     89        <c:if test="${(dataset != null) && indicator.statusOpen}">
     90        <li id="saveButton" class="Button" title="Commit/save the changes">
     91                <a href="javascript:requestPage('edit/indicator/dataset/dimensions/${dataset.name}.html')">Save</a>
     92        </li>
     93        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     94                <a href="javascript:confirmReset()">Reset</a>
     95        </li>
     96        </c:if>
     97</c:set>
     98<%@ include file="../../_navigation_menu.jsp"%>
    10499
    105100                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/list.jsp

    r13328 r13329  
    4848        <div id="content">
    4949
    50                 <div id="navigationMenu">
    51                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    52                         <h2>Navigation Menu</h2>
    53                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    54 
    55 <%@ include file="_menu_items.jsp"%>
    56 
    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>
    60 <c:if test="${indicator.statusOpen}">
    61         <c:if test="${userDetails.admin}">
    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>
    64                                 </li>
    65         </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>
    71                                 </li>
     50<c:set var="navigationMenuContextItems">
     51        <%@ include file="_menu_items.jsp"%>
     52        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     53                <a href="javascript:requestPage('edit/indicator/dataset/detail', '${selectedDatasetName}')">Edit Detail</a>
     54        </li>
     55        <c:if test="${indicator.statusOpen}">
     56                <c:if test="${userDetails.admin}">
     57        <li id="newButton" class="Button" title="Creates/adds a new item">
     58                <a href="javascript:requestPage('edit/indicator/dataset/detail/-NEW-.html')">Add New</a>
     59        </li>
     60                </c:if>
     61        <li id="saveButton" class="Button" title="Commit/save the changes">
     62                <a href="javascript:requestPage('edit/indicator/dataset/list/${selectedIndicatorName}.html')">Save</a>
     63        </li>
     64        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     65                <a href="javascript:confirmReset()">Reset</a>
     66        </li>
    7267<%--
    7368        <c:if test="${userDetails.admin}">
     
    7772        </c:if>
    7873--%>
    79 </c:if>
    80                         </ul>
    81                 </div>
     74        </c:if>
     75</c:set>
     76<%@ include file="../../_navigation_menu.jsp"%>
    8277
    8378                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/record/_menu_items.jsp

    r13328 r13329  
    11<%-- Menu Snippet that is related to Indicator Type Pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="indicator/dataset/record/detail">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/record/detail.jsp

    r13328 r13329  
    109109        <div id="content">
    110110
    111                 <div id="navigationMenu">
    112                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    113                         <h2>Navigation Menu</h2>
    114                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    115 
    116 <%@ include file="_menu_items.jsp"%>
    117 
    118 <c:if test="${indicator.statusOpen}">
    119                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    120                                         <a href="javascript:requestPage('edit/indicator/dataset/detail')">Save</a>
    121                                 </li>
    122                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    123                                         <a href="javascript:confirmReset()">Reset</a>
    124                                 </li>
    125 </c:if>
    126                         </ul>
    127                 </div>
     111<c:set var="navigationMenuContextItems">
     112        <%@ include file="_menu_items.jsp"%>
     113        <c:if test="${indicator.statusOpen}">
     114        <li id="saveButton" class="Button" title="Commit/save the changes">
     115                <a href="javascript:requestPage('edit/indicator/dataset/detail')">Save</a>
     116        </li>
     117        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     118                <a href="javascript:confirmReset()">Reset</a>
     119        </li>
     120        </c:if>
     121</c:set>
     122<%@ include file="../../../_navigation_menu.jsp"%>
    128123
    129124                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/dataset/record/list.jsp

    r13328 r13329  
    155155        <div id="content">
    156156
    157                 <div id="navigationMenu">
    158                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    159                         <h2>Navigation Menu</h2>
    160                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    161 
    162 <%@ include file="_menu_items.jsp"%>
    163 
     157<c:set var="navigationMenuContextItems">
     158        <%@ include file="_menu_items.jsp"%>
    164159<%--
    165160<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>
    166161--%>
    167                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    168                                         <a href="javascript:requestPage('edit/indicator/dataset/detail')">Edit Detail</a>
    169                                 </li>
    170 <c:if test="${(dataset != null) && indicator.statusOpen}">
    171                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    172                                         <a href="javascript:requestPage('edit/indicator/dataset/records/${dataset.name}.html')">Save</a>
    173                                 </li>
    174                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    175                                         <a href="javascript:confirmReset()">Reset</a>
    176                                 </li>
    177 </c:if>
    178                         </ul>
    179                 </div>
     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>
     165        <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</c:set>
     174<%@ include file="../../../_navigation_menu.jsp"%>
    180175
    181176                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/detail.jsp

    r13328 r13329  
    9696        <div id="content">
    9797
    98                 <div id="navigationMenu">
    99                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    100                         <h2>Navigation Menu</h2>
    101                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    102 
    103 <%@ include file="_menu_items.jsp"%>
    104 
    105 <c:if test="${not empty indicator.name}">
    106                                 <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
    107                                         <a href="javascript:showPreviewPage('preview/indicator/profile/${indicator.name}.html')">Preview</a>
    108                                 </li>
    109 </c:if>
    110 
    111 <c:if test="${userDetails.admin && indicator.approved}">
    112                                 <li id="publishButton" class="Button" title="Publish to the public view site">
    113                                         <a href="javascript:confirmPublish('${indicator.name}')">Publish</a>
    114                                 </li>
    115 </c:if>
    116                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    117                                         <a href="javascript:requestPage('edit/indicator/detail/${indicator.name}.html')">Save</a>
    118                                 </li>
    119                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    120                                         <a href="javascript:confirmReset()">Reset</a>
    121                                 </li>
    122                         </ul>
    123                 </div>
     98<c:set var="navigationMenuContextItems">
     99        <%@ include file="_menu_items.jsp"%>
     100        <c:if test="${not empty indicator.name}">
     101        <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
     102                <a href="javascript:showPreviewPage('preview/indicator/profile/${indicator.name}.html')">Preview</a>
     103        </li>
     104        </c:if>
     105
     106        <c:if test="${userDetails.admin && indicator.approved}">
     107        <li id="publishButton" class="Button" title="Publish to the public view site">
     108                <a href="javascript:confirmPublish('${indicator.name}')">Publish</a>
     109        </li>
     110        </c:if>
     111        <li id="saveButton" class="Button" title="Commit/save the changes">
     112                <a href="javascript:requestPage('edit/indicator/detail/${indicator.name}.html')">Save</a>
     113        </li>
     114        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     115                <a href="javascript:confirmReset()">Reset</a>
     116        </li>
     117</c:set>
     118<%@ include file="../_navigation_menu.jsp"%>
    124119
    125120<c:set var="formAction">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/editors.jsp

    r13328 r13329  
    4646        <div id="content">
    4747
    48                 <div id="navigationMenu">
    49                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    50                         <h2>Navigation Menu</h2>
    51                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    52 
    53 <%@ include file="_menu_items.jsp"%>
    54                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    55                                         <a href="javascript:requestPage('edit/indicator/editors')">Save</a>
    56                                 </li>
    57                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    58                                                         <a href="javascript:confirmReset()">Reset</a>
    59                                 </li>
    60                         </ul>
    61                 </div>
     48<c:set var="navigationMenuContextItems">
     49        <%@ include file="_menu_items.jsp"%>
     50        <li id="saveButton" class="Button" title="Commit/save the changes">
     51                <a href="javascript:requestPage('edit/indicator/editors')">Save</a>
     52        </li>
     53        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     54                <a href="javascript:confirmReset()">Reset</a>
     55        </li>
     56</c:set>
     57<%@ include file="../_navigation_menu.jsp"%>
    6258
    6359                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/footnote_references.jsp

    r13328 r13329  
    3131        <div id="content">
    3232
    33                 <div id="navigationMenu">
    34                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    35                         <h2>Navigation Menu</h2>
    36                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    37 
    38 <%@ include file="_menu_items.jsp"%>
    39 
    40                                 <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
    41                                                         <a href="javascript:showPreviewPage('preview/indicator/important_facts/${indicator.name}.html')">Preview</a>
    42                                 </li>
    43 <c:if test="${indicator.statusOpen}">
    44                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    45                                         <a href="javascript:requestPage('edit/indicator/footnote_references')">Save</a>
    46                                 </li>
    47                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    48                                                         <a href="javascript:confirmReset()">Reset</a>
    49                                 </li>
    50 </c:if>
    51                         </ul>
    52                 </div>
     33<c:set var="navigationMenuContextItems">
     34        <%@ include file="_menu_items.jsp"%>
     35        <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
     36                <a href="javascript:showPreviewPage('preview/indicator/important_facts/${indicator.name}.html')">Preview</a>
     37        </li>
     38        <c:if test="${indicator.statusOpen}">
     39        <li id="saveButton" class="Button" title="Commit/save the changes">
     40                <a href="javascript:requestPage('edit/indicator/footnote_references')">Save</a>
     41        </li>
     42        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     43                <a href="javascript:confirmReset()">Reset</a>
     44        </li>
     45        </c:if>
     46</c:set>
     47<%@ include file="../_navigation_menu.jsp"%>
    5348
    5449                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/initiatives.jsp

    r13328 r13329  
    6060        <div id="content">
    6161
    62                 <div id="navigationMenu">
    63                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    64                         <h2>Navigation Menu</h2>
    65                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    66 
    67 <%@ include file="_menu_items.jsp"%>
    68 
    69                                 <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
    70                                                         <a href="javascript:showPreviewPage('preview/indicator/profile/${indicator.name}.html')">Preview</a>
    71                                 </li>
    72 <c:if test="${indicator.statusOpen}">
    73                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    74                                         <a href="javascript:requestPage('edit/indicator/initiatives/${indicator.name}.html')">Save</a>
    75                                 </li>
    76                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    77                                                         <a href="javascript:confirmReset()">Reset</a>
    78                                 </li>
    79 </c:if>
    80                         </ul>
    81                 </div>
     62<c:set var="navigationMenuContextItems">
     63        <%@ include file="_menu_items.jsp"%>
     64        <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
     65                <a href="javascript:showPreviewPage('preview/indicator/profile/${indicator.name}.html')">Preview</a>
     66        </li>
     67        <c:if test="${indicator.statusOpen}">
     68        <li id="saveButton" class="Button" title="Commit/save the changes">
     69                <a href="javascript:requestPage('edit/indicator/initiatives/${indicator.name}.html')">Save</a>
     70        </li>
     71        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     72                <a href="javascript:confirmReset()">Reset</a>
     73        </li>
     74        </c:if>
     75</c:set>
     76<%@ include file="../_navigation_menu.jsp"%>
    8277
    8378                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/list.jsp

    r13328 r13329  
    7272        <div id="content">
    7373
    74                 <div id="navigationMenu">
    75                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    76                         <h2>Navigation Menu</h2>
    77                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    78 
    79 <%@ include file="_menu_items.jsp"%>
    80 
    81                                 <li id="editButton" class="Button" title="Main detail page">
    82                                         <a href="javascript:requestPage('edit/indicator/detail')">Edit Detail</a>
    83                                 </li>
    84                                 <li id="previewButton" class="Button" title="Indicator Preview">
    85                                                         <a href="javascript:showPreviewPage('preview/indicator/profile')">Preview</a>
    86                                 </li>
    87 <c:if test="${userDetails.admin}">
    88                                 <li id="newButton" class="Button" title="Shows the new indicator creation page.">
    89                                         <a href="javascript:requestPage('edit/indicator/detail/-NEW-.html')">Add New</a>
    90                                 </li>
    91                                 <li id="publishButton" class="Button" title="Publish ALL approved indicators to the public view site">
    92                                                         <a href="javascript:confirmPublish('approved')">Publish All</a>
    93                                 </li>
    94 </c:if>
    95                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    96                                         <a href="javascript:requestPage('edit/indicator/list')">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>
    101                         </ul>
    102                 </div>
     74<c:set var="navigationMenuContextItems">
     75        <%@ include file="_menu_items.jsp"%>
     76        <li id="editButton" class="Button" title="Main detail page">
     77                <a href="javascript:requestPage('edit/indicator/detail')">Edit Detail</a>
     78        </li>
     79        <li id="previewButton" class="Button" title="Indicator Preview">
     80                <a href="javascript:showPreviewPage('preview/indicator/profile')">Preview</a>
     81        </li>
     82        <c:if test="${userDetails.admin}">
     83        <li id="newButton" class="Button" title="Shows the new indicator creation page.">
     84                <a href="javascript:requestPage('edit/indicator/detail/-NEW-.html')">Add New</a>
     85        </li>
     86        <li id="publishButton" class="Button" title="Publish ALL approved indicators to the public view site">
     87                <a href="javascript:confirmPublish('approved')">Publish All</a>
     88                </li>
     89        </c:if>
     90        <li id="saveButton" class="Button" title="Commit/save the changes">
     91                <a href="javascript:requestPage('edit/indicator/list')">Save</a>
     92        </li>
     93        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     94                <a href="javascript:confirmReset()">Reset</a>
     95        </li>
     96</c:set>
     97<%@ include file="../_navigation_menu.jsp"%>
    10398
    10499                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/more_resources.jsp

    r13328 r13329  
    3131        <div id="content">
    3232
    33                 <div id="navigationMenu">
    34                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    35                         <h2>Navigation Menu</h2>
    36                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    37 
    38 <%@ include file="_menu_items.jsp"%>
    39 
    40                                 <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
    41                                                         <a href="javascript:showPreviewPage('preview/indicator/other_resources/${indicator.name}.html')">Preview</a>
    42                                 </li>
    43 <c:if test="${indicator.statusOpen}">
    44                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    45                                         <a href="javascript:requestPage('edit/indicator/more_resources')">Save</a>
    46                                 </li>
    47                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    48                                                         <a href="javascript:confirmReset()">Reset</a>
    49                                 </li>
    50 </c:if>
    51                         </ul>
    52                 </div>
     33<c:set var="navigationMenuContextItems">
     34        <%@ include file="_menu_items.jsp"%>
     35        <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
     36                <a href="javascript:showPreviewPage('preview/indicator/other_resources/${indicator.name}.html')">Preview</a>
     37        </li>
     38        <c:if test="${indicator.statusOpen}">
     39        <li id="saveButton" class="Button" title="Commit/save the changes">
     40                <a href="javascript:requestPage('edit/indicator/more_resources')">Save</a>
     41        </li>
     42        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     43                <a href="javascript:confirmReset()">Reset</a>
     44        </li>
     45        </c:if>
     46</c:set>
     47<%@ include file="../_navigation_menu.jsp"%>
    5348
    5449                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/owner.jsp

    r13328 r13329  
    3838        <div id="content">
    3939
    40                 <div id="navigationMenu">
    41                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    42                         <h2>Navigation Menu</h2>
    43                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    44 
    45 <%@ include file="_menu_items.jsp"%>
    46 
    47                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    48                                         <a href="javascript:requestPage('edit/indicator/owner')">Save</a>
    49                                 </li>
    50                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    51                                                         <a href="javascript:confirmReset()">Reset</a>
    52                                 </li>
    53                         </ul>
    54                 </div>
     40<c:set var="navigationMenuContextItems">
     41        <%@ include file="_menu_items.jsp"%>
     42        <li id="saveButton" class="Button" title="Commit/save the changes">
     43                <a href="javascript:requestPage('edit/indicator/owner')">Save</a>
     44        </li>
     45        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     46                <a href="javascript:confirmReset()">Reset</a>
     47        </li>
     48</c:set>
     49<%@ include file="../_navigation_menu.jsp"%>
    5550
    5651                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/related_indicators.jsp

    r13328 r13329  
    137137        <div id="content">
    138138
    139                 <div id="navigationMenu">
    140                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    141                         <h2>Navigation Menu</h2>
    142                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    143 
    144 <%@ include file="_menu_items.jsp"%>
    145 
    146                                 <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
    147                                         <a href="javascript:showRelatedPreviewPage('preview/indicator/related/${indicator.name}.html')">Preview</a>
    148                                 </li>
    149 <c:if test="${indicator.statusOpen}">
    150                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    151                                         <a href="javascript:requestPage('edit/indicator/related_indicators/${indicatorRelation.relationName}/${indicator.name}.html')">Save</a>
    152                                 </li>
    153                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    154                                         <a href="javascript:confirmReset()">Reset</a>
    155                                 </li>
    156 </c:if>
    157                         </ul>
    158                 </div>
     139<c:set var="navigationMenuContextItems">
     140        <%@ include file="_menu_items.jsp"%>
     141        <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
     142                <a href="javascript:showRelatedPreviewPage('preview/indicator/related/${indicator.name}.html')">Preview</a>
     143        </li>
     144        <c:if test="${indicator.statusOpen}">
     145        <li id="saveButton" class="Button" title="Commit/save the changes">
     146                <a href="javascript:requestPage('edit/indicator/related_indicators/${indicatorRelation.relationName}/${indicator.name}.html')">Save</a>
     147        </li>
     148        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     149                <a href="javascript:confirmReset()">Reset</a>
     150        </li>
     151        </c:if>
     152</c:set>
     153<%@ include file="../_navigation_menu.jsp"%>
    159154
    160155                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/topics.jsp

    r13328 r13329  
    7272        <div id="content">
    7373
    74                 <div id="navigationMenu">
    75                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    76                         <h2>Navigation Menu</h2>
    77                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    78 
    79 <%@ include file="_menu_items.jsp"%>
    80 
    81                                 <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
    82                                                         <a href="javascript:showPreviewPage('preview/indicator/profile/${indicator.name}.html')">Preview</a>
    83                                 </li>
    84 <c:if test="${indicator.statusOpen}">
    85                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    86                                         <a href="javascript:requestPage('edit/indicator/topics/${indicator.name}.html')">Save</a>
    87                                 </li>
    88                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    89                                                         <a href="javascript:confirmReset()">Reset</a>
    90                                 </li>
    91 </c:if>
    92                         </ul>
    93                 </div>
     74<c:set var="navigationMenuContextItems">
     75        <%@ include file="_menu_items.jsp"%>
     76        <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
     77                <a href="javascript:showPreviewPage('preview/indicator/profile/${indicator.name}.html')">Preview</a>
     78        </li>
     79        <c:if test="${indicator.statusOpen}">
     80        <li id="saveButton" class="Button" title="Commit/save the changes">
     81                <a href="javascript:requestPage('edit/indicator/topics/${indicator.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>
     86        </c:if>
     87</c:set>
     88<%@ include file="../_navigation_menu.jsp"%>
    9489
    9590                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/_ui_control.jsp

    r3154 r13329  
    1 <c:set var="inputControl"   >readonly="true"</c:set>
    2 <c:set var="checkboxControl">onclick="return(false);" disabled</c:set>
    3 <c:set var="selectControl"  >onclick="return(false);" disabled</c:set>
    4 <c:set var="radioControl"   >onclick="return(false);" disabled onfocus="this.blur()"</c:set>
    5 
    6 <c:set var="onChange"></c:set>
    7 <c:set var="onClick" ></c:set>
     1<%@ include file="../_ui_control.jsp"%>
    82
    93<c:if test="${(indicator != null) && (indicatorView != null) && indicator.statusOpen}">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/datasets.jsp

    r13328 r13329  
    4040        <div id="content">
    4141
    42                 <div id="navigationMenu">
    43                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    44                         <h2>Navigation Menu</h2>
    45                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    46 
    47 <%@ include file="_menu_items.jsp"%>
    48 
    49                                 <li class="SubList">
    50                                         <ul>
     42<c:set var="navigationMenuContextItems">
     43        <%@ include file="_menu_items.jsp"%>
    5144<%@ include file="_sublist_menu_items.jsp"%>
    52 <c:if test="${indicator.statusOpen}">
    53                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    54                                                         <a href="javascript:requestPage('edit/indicator/view/datasets/${selectedIndicatorViewName}.html')">Save</a>
    55                                                 </li>
    56                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    57                                                         <a href="javascript:confirmReset()">Reset</a>
    58                                                 </li>
    59 </c:if>
    60                                         </ul>
    61                                 </li>
    62                         </ul>
    63                 </div>
     45        <c:if test="${indicator.statusOpen}">
     46        <li id="saveButton" class="Button" title="Commit/save the changes">
     47                <a href="javascript:requestPage('edit/indicator/view/datasets/${selectedIndicatorViewName}.html')">Save</a>
     48        </li>
     49        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     50                <a href="javascript:confirmReset()">Reset</a>
     51        </li>
     52        </c:if>
     53</c:set>
     54<%@ include file="../_navigation_menu.jsp"%>
    6455
    6556                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/detail.jsp

    r13328 r13329  
    8282        <div id="content">
    8383
    84                 <div id="navigationMenu">
    85                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    86                         <h2>Navigation Menu</h2>
    87                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    88 
    89 <%@ include file="_menu_items.jsp"%>
    90 
    91                                 <li class="SubList">
    92                                         <ul>
    93 
     84<c:set var="navigationMenuContextItems">
     85        <%@ include file="_menu_items.jsp"%>
    9486<%@ include file="_sublist_menu_items.jsp"%>
    95 
    96 <c:if test="${not empty indicatorView.name}">
    97                                                 <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
    98                                                         <a href="javascript:showPreviewPage('preview/indicator/view/${indicatorView.name}.html')">Preview</a>
    99                                                 </li>
    100 </c:if>
    101 
    102 <c:if test="${indicator.statusOpen}">
    103                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    104                                                         <a href="javascript:requestPage('edit/indicator/view/detail/${indicatorView.name}.html')">Save</a>
    105                                                 </li>
    106                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    107                                                         <a href="javascript:confirmReset()">Reset</a>
    108                                                 </li>
    109 </c:if>
    110                                         </ul>
    111                                 </li>
    112                         </ul>
    113                 </div>
     87        <c:if test="${not empty indicatorView.name}">
     88        <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
     89                <a href="javascript:showPreviewPage('preview/indicator/view/${indicatorView.name}.html')">Preview</a>
     90        </li>
     91        </c:if>
     92        <c:if test="${indicator.statusOpen}">
     93        <li id="saveButton" class="Button" title="Commit/save the changes">
     94                <a href="javascript:requestPage('edit/indicator/view/detail/${indicatorView.name}.html')">Save</a>
     95        </li>
     96        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     97                <a href="javascript:confirmReset()">Reset</a>
     98        </li>
     99        </c:if>
     100</c:set>
     101<%@ include file="../_navigation_menu.jsp"%>
    114102
    115103                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/dimension_values.jsp

    r13328 r13329  
    7171        <div id="content">
    7272
    73                 <div id="navigationMenu">
    74                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    75                         <h2>Navigation Menu</h2>
    76                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    77 
    78 <%@ include file="_menu_items.jsp"%>
    79 
    80                                 <li class="SubList">
    81                                         <ul>
     73<c:set var="navigationMenuContextItems">
     74        <%@ include file="_menu_items.jsp"%>
    8275<%@ include file="_sublist_menu_items.jsp"%>
    83 <c:if test="${(indicatorView != null) && indicator.statusOpen}">
    84                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    85                                                         <a href="javascript:requestPage('edit/indicator/view/dimension/values/${indicatorView.name}.html')">Save</a>
    86                                                 </li>
    87                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    88                                                         <a href="javascript:confirmReset()">Reset</a>
    89                                                 </li>
    90 </c:if>
    91                                         </ul>
    92                                 </li>
    93                         </ul>
    94                 </div>
     76        <c:if test="${(indicatorView != null) && indicator.statusOpen}">
     77        <li id="saveButton" class="Button" title="Commit/save the changes">
     78                <a href="javascript:requestPage('edit/indicator/view/dimension/values/${indicatorView.name}.html')">Save</a>
     79        </li>
     80        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     81                <a href="javascript:confirmReset()">Reset</a>
     82        </li>
     83        </c:if>
     84</c:set>
     85<%@ include file="../_navigation_menu.jsp"%>
    9586
    9687                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/dimensions.jsp

    r13328 r13329  
    7878        <div id="content">
    7979
    80                 <div id="navigationMenu">
    81                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    82                         <h2>Navigation Menu</h2>
    83                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    84 
    85 <%@ include file="_menu_items.jsp"%>
    86 
    87                                 <li class="SubList">
    88                                         <ul>
     80<c:set var="navigationMenuContextItems">
     81        <%@ include file="_menu_items.jsp"%>
    8982<%@ include file="_sublist_menu_items.jsp"%>
    90 <c:if test="${(indicatorView != null) && indicator.statusOpen}">
    91                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    92                                                         <a href="javascript:requestPage('edit/indicator/view/dimensions/${indicatorView.name}.html')">Save</a>
    93                                                 </li>
    94                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    95                                                         <a href="javascript:confirmReset()">Reset</a>
    96                                                 </li>
    97 </c:if>
    98                                         </ul>
    99                                 </li>
    100                         </ul>
    101                 </div>
     83        <c:if test="${(indicatorView != null) && indicator.statusOpen}">
     84        <li id="saveButton" class="Button" title="Commit/save the changes">
     85                <a href="javascript:requestPage('edit/indicator/view/dimensions/${indicatorView.name}.html')">Save</a>
     86        </li>
     87        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     88                <a href="javascript:confirmReset()">Reset</a>
     89        </li>
     90        </c:if>
     91</c:set>
     92<%@ include file="../_navigation_menu.jsp"%>
    10293
    10394                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/list.jsp

    r13328 r13329  
    5858        <div id="content">
    5959
    60                 <div id="navigationMenu">
    61                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    62                         <h2>Navigation Menu</h2>
    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>
    72 
    73 <%@ include file="_menu_items.jsp"%>
    74 
    75                                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    76                                                         <a href="javascript:requestPage('edit/indicator/view/detail/${selectedIndicatorViewName}.html')">Edit Detail</a>
    77                                                 </li>
    78                                                 <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
    79                                                         <a href="javascript:showPreviewPage('preview/indicator/view/chart')">Preview</a>
    80                                                 </li>
    81 
    82 <c:if test="${indicator.statusOpen}">
    83         <c:if test="${userDetails.admin}">
    84                                                 <li id="newButton" class="Button" title="Creates/adds a new item">
    85                                                         <a href="javascript:requestPage('edit/indicator/view/detail/-NEW-.html')">Add New</a>
    86                                                 </li>
     60<c:set var="navigationMenuContextItems">
     61        <%@ include file="_menu_items.jsp"%>
     62        <c:if test="${not(userDetails.admin)}">
     63        <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>
    8764        </c:if>
    88                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    89                                                         <a href="javascript:requestPage('edit/indicator/view/list/${selectedIndicatorName}.html')">Save</a>
    90                                                 </li>
    91                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    92                                                         <a href="javascript:confirmReset()">Reset</a>
    93                                                 </li>
     65        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     66                <a href="javascript:requestPage('edit/indicator/view/detail/${selectedIndicatorViewName}.html')">Edit Detail</a>
     67        </li>
     68        <li id="previewButton" class="Button" title="Shows what this data will look like when published.">
     69                <a href="javascript:showPreviewPage('preview/indicator/view/chart')">Preview</a>
     70        </li>
     71        <c:if test="${indicator.statusOpen}">
     72                <c:if test="${userDetails.admin}">
     73        <li id="newButton" class="Button" title="Creates/adds a new item">
     74                <a href="javascript:requestPage('edit/indicator/view/detail/-NEW-.html')">Add New</a>
     75        </li>
     76                </c:if>
     77        <li id="saveButton" class="Button" title="Commit/save the changes">
     78                <a href="javascript:requestPage('edit/indicator/view/list/${selectedIndicatorName}.html')">Save</a>
     79        </li>
     80        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     81                <a href="javascript:confirmReset()">Reset</a>
     82        </li>
    9483<%--
    9584        <c:if test="${userDetails.admin}">
    96                                 <li id="deleteButton" class="Button Show" title="Delete this record">
    97                                                         <a href="javascript:confirmDelete('delete/indicator/view/list')">Delete</a>
    98                                 </li>
     85        <li id="deleteButton" class="Button Show" title="Delete this record">
     86                <a href="javascript:confirmDelete('delete/indicator/view/list')">Delete</a>
     87        </li>
    9988        </c:if>
    10089--%>
    101 </c:if>
    102                                         </ul>
    103                                 </li>
    104                         </ul>
    105                 </div>
     90        </c:if>
     91</c:set>
     92<%@ include file="../../_navigation_menu.jsp"%>
    10693
    10794                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/queries.jsp

    r13328 r13329  
    118118        <div id="content">
    119119
    120                 <div id="navigationMenu">
    121                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    122                         <h2>Navigation Menu</h2>
    123                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    124 
    125 <%@ include file="_menu_items.jsp"%>
    126 
    127                                 <li class="SubList">
    128                                         <ul>
     120<c:set var="navigationMenuContextItems">
     121        <%@ include file="_menu_items.jsp"%>
     122        <li class="SubList">
     123                <ul>
    129124<%@ include file="_sublist_menu_items.jsp"%>
    130125<c:if test="${indicator.statusOpen}">
    131                                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    132                                                         <a href="javascript:requestPage('edit/indicator/view/queries/${selectedIndicatorViewName}.html')">Save</a>
    133                                                 </li>
    134                                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    135                                                         <a href="javascript:confirmReset()">Reset</a>
    136                                                 </li>
     126                        <li id="saveButton" class="Button" title="Commit/save the changes">
     127                                <a href="javascript:requestPage('edit/indicator/view/queries/${selectedIndicatorViewName}.html')">Save</a>
     128                        </li>
     129                        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     130                                <a href="javascript:confirmReset()">Reset</a>
     131                        </li>
    137132</c:if>
    138                                         </ul>
    139                                 </li>
    140                         </ul>
    141                 </div>
     133                </ul>
     134        </li>
     135</c:set>
     136<%@ include file="../../_navigation_menu.jsp"%>
    142137
    143138                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/_menu_items.jsp

    r13315 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="initiative/list"  ><a href="javascript:requestPage('edit/initiative/list')" title="List of">Initiative List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/detail.jsp

    r13328 r13329  
    4242        <div id="content">
    4343
    44                 <div id="navigationMenu">
    45                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    46                         <h2>Navigation Menu</h2>
    47                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    48 
    49 <%@ include file="_menu_items.jsp"%>
    50 
    51                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    52                                         <a href="javascript:requestPage('edit/initiative/detail')">Save</a>
    53                                 </li>
    54                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    55                                                         <a href="javascript:confirmReset()">Reset</a>
    56                                 </li>
     44<c:set var="navigationMenuContextItems">
     45        <%@ include file="_menu_items.jsp"%>
     46        <li id="saveButton" class="Button" title="Commit/save the changes">
     47                <a href="javascript:requestPage('edit/initiative/detail')">Save</a>
     48        </li>
     49        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     50                <a href="javascript:confirmReset()">Reset</a>
     51        </li>
    5752<%--
    58                                 <li id="deleteButton" class="Button" title="Delete this record">
    59                                                         <a href="javascript:confirmDelete('delete/initiative/detail/${selectedInitiativeName}.html')">Delete</a>
    60                                 </li>
     53        <li id="deleteButton" class="Button" title="Delete this record">
     54                <a href="javascript:confirmDelete('delete/initiative/detail/${selectedInitiativeName}.html')">Delete</a>
     55        </li>
    6156--%>
    62                         </ul>
    63                 </div>
     57</c:set>
     58<%@ include file="../_navigation_menu.jsp"%>
    6459
    6560                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/list.jsp

    r13328 r13329  
    5757        <div id="content">
    5858
    59                 <div id="navigationMenu">
    60                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    61                         <h2>Navigation Menu</h2>
    62                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    63 
    64 <%@ include file="_menu_items.jsp"%>
    65 
    66                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    67                                         <a href="javascript:requestPage('edit/initiative/detail')">Edit Detail</a>
    68                                 </li>
    69                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    70                                         <a href="javascript:requestPage('edit/initiative/list')">Save</a>
    71                                 </li>
    72                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    73                                                         <a href="javascript:confirmReset()">Reset</a>
    74                                 </li>
    75                         </ul>
    76                 </div>
     59<c:set var="navigationMenuContextItems">
     60        <%@ include file="_menu_items.jsp"%>
     61        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     62                <a href="javascript:requestPage('edit/initiative/detail')">Edit Detail</a>
     63        </li>
     64        <li id="saveButton" class="Button" title="Commit/save the changes">
     65                <a href="javascript:requestPage('edit/initiative/list')">Save</a>
     66        </li>
     67        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     68                <a href="javascript:confirmReset()">Reset</a>
     69        </li>
     70</c:set>
     71<%@ include file="../_navigation_menu.jsp"%>
    7772
    7873                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/detail.jsp

    r13328 r13329  
    4747        <div id="content">
    4848
    49                 <div id="navigationMenu">
    50                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    51                         <h2>Navigation Menu</h2>
    52                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    53 
    54 <%@ include file="_menu_items.jsp"%>
    55 
    56                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    57                                         <a href="javascript:requestPage('edit/initiative/topic/detail')">Save</a>
    58                                 </li>
    59                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    60                                                         <a href="javascript:confirmReset()">Reset</a>
    61                                 </li>
     49<c:set var="navigationMenuContextItems">
     50        <%@ include file="_menu_items.jsp"%>
     51        <li id="saveButton" class="Button" title="Commit/save the changes">
     52                <a href="javascript:requestPage('edit/initiative/topic/detail')">Save</a>
     53        </li>
     54        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     55                <a href="javascript:confirmReset()">Reset</a>
     56        </li>
    6257<%--
    63                                 <li id="deleteButton" class="Button" title="Delete this record">
    64                                                         <a href="javascript:confirmDelete('delete/initiative/topic/detail/${selectedInitiativeTopicName}.html')">Delete</a>
    65                                 </li>
     58        <li id="deleteButton" class="Button" title="Delete this record">
     59                <a href="javascript:confirmDelete('delete/initiative/topic/detail/${selectedInitiativeTopicName}.html')">Delete</a>
     60        </li>
    6661--%>
    67                         </ul>
    68                 </div>
     62</c:set>
     63<%@ include file="../../_navigation_menu.jsp"%>
    6964
    7065                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/list.jsp

    r13328 r13329  
    5757        <div id="content">
    5858
    59                 <div id="navigationMenu">
    60                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    61                         <h2>Navigation Menu</h2>
    62                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    63 
    64 <%@ include file="_menu_items.jsp"%>
    65 
    66                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    67                                         <a href="javascript:requestPage('edit/initiative/topic/detail')">Edit Detail</a>
    68                                 </li>
    69                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    70                                         <a href="javascript:requestPage('edit/initiative/topic/list')">Save</a>
    71                                 </li>
    72                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    73                                                         <a href="javascript:confirmReset()">Reset</a>
    74                                 </li>
    75                         </ul>
    76                 </div>
     59<c:set var="navigationMenuContextItems">
     60        <%@ include file="_menu_items.jsp"%>
     61        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     62                <a href="javascript:requestPage('edit/initiative/topic/detail')">Edit Detail</a>
     63        </li>
     64        <li id="saveButton" class="Button" title="Commit/save the changes">
     65                <a href="javascript:requestPage('edit/initiative/topic/list')">Save</a>
     66        </li>
     67        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     68                <a href="javascript:confirmReset()">Reset</a>
     69        </li>
     70</c:set>
     71<%@ include file="../../_navigation_menu.jsp"%>
    7772
    7873                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/objective/detail.jsp

    r13328 r13329  
    5757        <div id="content">
    5858
    59                 <div id="navigationMenu">
    60                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    61                         <h2>Navigation Menu</h2>
    62                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    63 
    64 <%@ include file="_menu_items.jsp"%>
    65 
    66                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    67                                         <a href="javascript:requestPage('edit/initiative/topic/detail')">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>
    71                                 </li>
     59<c:set var="navigationMenuContextItems">
     60        <%@ include file="_menu_items.jsp"%>
     61        <li id="saveButton" class="Button" title="Commit/save the changes">
     62                <a href="javascript:requestPage('edit/initiative/topic/detail')">Save</a>
     63        </li>
     64        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     65                <a href="javascript:confirmReset()">Reset</a>
     66        </li>
    7267<%--
    73                                 <li id="deleteButton" class="Button" title="Delete this record">
    74                                                         <a href="javascript:confirmDelete('delete/initiative/topic/detail/${selectedInitiativeTopicName}.html')">Delete</a>
    75                                 </li>
     68        <li id="deleteButton" class="Button" title="Delete this record">
     69                <a href="javascript:confirmDelete('delete/initiative/topic/detail/${selectedInitiativeTopicName}.html')">Delete</a>
     70        </li>
    7671--%>
    77                         </ul>
    78                 </div>
     72</c:set>
     73<%@ include file="../../../_navigation_menu.jsp"%>
    7974
    8075                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/initiative/topic/objective/list.jsp

    r13328 r13329  
    5757        <div id="content">
    5858
    59                 <div id="navigationMenu">
    60                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    61                         <h2>Navigation Menu</h2>
    62                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    63 
    64 <%@ include file="_menu_items.jsp"%>
    65 
    66                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    67                                         <a href="javascript:requestPage('edit/initiative/topic/objective/detail')">Edit Detail</a>
    68                                 </li>
    69                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    70                                         <a href="javascript:requestPage('edit/initiative/topic/objective/list')">Save</a>
    71                                 </li>
    72                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    73                                                         <a href="javascript:confirmReset()">Reset</a>
    74                                 </li>
    75                         </ul>
    76                 </div>
     59<c:set var="navigationMenuContextItems">
     60        <%@ include file="_menu_items.jsp"%>
     61        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     62                <a href="javascript:requestPage('edit/initiative/topic/objective/detail')">Edit Detail</a>
     63        </li>
     64        <li id="saveButton" class="Button" title="Commit/save the changes">
     65                <a href="javascript:requestPage('edit/initiative/topic/objective/list')">Save</a>
     66        </li>
     67        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     68                <a href="javascript:confirmReset()">Reset</a>
     69        </li>
     70</c:set>
     71<%@ include file="../../../_navigation_menu.jsp"%>
    7772
    7873                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/map/_menu_items.jsp

    r11346 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="map/list"  ><a href="javascript:requestPage('edit/map/list')"   title="List of">Map List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/map/detail.jsp

    r13328 r13329  
    4141        <div id="content">
    4242
    43                 <div id="navigationMenu">
    44                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    45                         <h2>Navigation Menu</h2>
    46                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    47 
    48 <%@ include file="_menu_items.jsp"%>
    49 
    50                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    51                                         <a href="javascript:requestPage('edit/map/detail')">Save</a>
    52                                 </li>
    53                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    54                                                         <a href="javascript:confirmReset()">Reset</a>
    55                                 </li>
     43<c:set var="navigationMenuContextItems">
     44        <%@ include file="_menu_items.jsp"%>
     45        <li id="saveButton" class="Button" title="Commit/save the changes">
     46                <a href="javascript:requestPage('edit/map/detail')">Save</a>
     47        </li>
     48        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     49                <a href="javascript:confirmReset()">Reset</a>
     50        </li>
    5651<%--
    57                                 <li id="deleteButton" class="Button" title="Delete this record">
    58                                                         <a href="javascript:confirmDelete('view/map/detail_DELETE')">Delete</a>
    59                                 </li>
     52        <li id="deleteButton" class="Button" title="Delete this record">
     53                <a href="javascript:confirmDelete('view/map/detail_DELETE')">Delete</a>
     54        </li>
    6055--%>
    61                         </ul>
    62                 </div>
     56</c:set>
     57<%@ include file="../_navigation_menu.jsp"%>
    6358
    6459                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/map/list.jsp

    r13328 r13329  
    5757        <div id="content">
    5858
    59                 <div id="navigationMenu">
    60                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    61                         <h2>Navigation Menu</h2>
    62                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    63 
    64 <%@ include file="_menu_items.jsp"%>
    65 
    66                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    67                                         <a href="javascript:requestPage('edit/map/detail')">Edit Detail</a>
    68                                 </li>
    69                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    70                                         <a href="javascript:requestPage('edit/map/list')">Save</a>
    71                                 </li>
    72                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    73                                                         <a href="javascript:confirmReset()">Reset</a>
    74                                 </li>
    75                         </ul>
    76                 </div>
     59<c:set var="navigationMenuContextItems">
     60        <%@ include file="_menu_items.jsp"%>
     61        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     62                <a href="javascript:requestPage('edit/map/detail')">Edit Detail</a>
     63        </li>
     64        <li id="saveButton" class="Button" title="Commit/save the changes">
     65                <a href="javascript:requestPage('edit/map/list')">Save</a>
     66        </li>
     67        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     68                <a href="javascript:confirmReset()">Reset</a>
     69        </li>
     70</c:set>
     71<%@ include file="../_navigation_menu.jsp"%>
    7772
    7873                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/measure/_menu_items.jsp

    r11346 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="measure/list"  ><a href="javascript:requestPage('edit/measure/list')"   title="List of">Measure List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/measure/detail.jsp

    r13328 r13329  
    4141        <div id="content">
    4242
    43                 <div id="navigationMenu">
    44                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    45                         <h2>Navigation Menu</h2>
    46                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    47 
    48 <%@ include file="_menu_items.jsp"%>
    49 
    50                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    51                                         <a href="javascript:requestPage('edit/measure/detail')">Save</a>
    52                                 </li>
    53                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    54                                                         <a href="javascript:confirmReset()">Reset</a>
    55                                 </li>
    56                         </ul>
    57                 </div>
     43<c:set var="navigationMenuContextItems">
     44        <%@ include file="_menu_items.jsp"%>
     45        <li id="saveButton" class="Button" title="Commit/save the changes">
     46                <a href="javascript:requestPage('edit/measure/detail')">Save</a>
     47        </li>
     48        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     49                <a href="javascript:confirmReset()">Reset</a>
     50        </li>
     51</c:set>
     52<%@ include file="../_navigation_menu.jsp"%>
    5853
    5954                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/measure/list.jsp

    r13328 r13329  
    7171        <div id="content">
    7272
    73                 <div id="navigationMenu">
    74                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    75                         <h2>Navigation Menu</h2>
    76                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    77 
    78 <%@ include file="_menu_items.jsp"%>
    79 
    80                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    81                                         <a href="javascript:requestPage('edit/measure/detail')">Edit Detail</a>
    82                                 </li>
    83                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    84                                         <a href="javascript:requestPage('edit/measure/list')">Save</a>
    85                                 </li>
    86                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    87                                                         <a href="javascript:confirmReset()">Reset</a>
    88                                 </li>
     73<c:set var="navigationMenuContextItems">
     74        <%@ include file="_menu_items.jsp"%>
     75        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     76                <a href="javascript:requestPage('edit/measure/detail')">Edit Detail</a>
     77        </li>
     78        <li id="saveButton" class="Button" title="Commit/save the changes">
     79                <a href="javascript:requestPage('edit/measure/list')">Save</a>
     80        </li>
     81        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     82                <a href="javascript:confirmReset()">Reset</a>
     83        </li>
    8984<!--
    90                                 <li id="deleteButton" class="Button Show" title="Delete this record">
    91                                                         <a href="javascript:confirmDelete('delete/title/list')">Delete</a>
    92                                 </li>
     85        <li id="deleteButton" class="Button Show" title="Delete this record">
     86                <a href="javascript:confirmDelete('delete/title/list')">Delete</a>
     87        </li>
    9388-->
    94                         </ul>
    95                 </div>
     89</c:set>
     90<%@ include file="../_navigation_menu.jsp"%>
    9691
    9792                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/org_unit/_menu_items.jsp

    r11346 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="org_unit/list"  ><a href="javascript:requestPage('edit/org_unit/list')"   title="List of">Org Unit List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/org_unit/detail.jsp

    r13328 r13329  
    4646        <div id="content">
    4747
    48                 <div id="navigationMenu">
    49                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    50                         <h2>Navigation Menu</h2>
    51                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    52 
    53 <%@ include file="_menu_items.jsp"%>
    54 
    55                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    56                                         <a href="javascript:requestPage('edit/org_unit/detail')">Save</a>
    57                                 </li>
    58                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    59                                                         <a href="javascript:confirmReset()">Reset</a>
    60                                 </li>
     48<c:set var="navigationMenuContextItems">
     49        <%@ include file="_menu_items.jsp"%>
     50        <li id="saveButton" class="Button" title="Commit/save the changes">
     51                <a href="javascript:requestPage('edit/org_unit/detail')">Save</a>
     52        </li>
     53        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     54                <a href="javascript:confirmReset()">Reset</a>
     55        </li>
    6156<%--
    62                                 <li id="deleteButton" class="Button" title="Delete this record">
    63                                                         <a href="javascript:confirmDelete('view/org_unit/detail_DELETE')">Delete</a>
    64                                 </li>
     57        <li id="deleteButton" class="Button" title="Delete this record">
     58                <a href="javascript:confirmDelete('view/org_unit/detail_DELETE')">Delete</a>
     59        </li>
    6560--%>
    66                         </ul>
    67                 </div>
     61</c:set>
     62<%@ include file="../_navigation_menu.jsp"%>
    6863
    6964                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/org_unit/list.jsp

    r13328 r13329  
    6868        <div id="content">
    6969
    70                 <div id="navigationMenu">
    71                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    72                         <h2>Navigation Menu</h2>
    73                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    74 
    75 <%@ include file="_menu_items.jsp"%>
    76 
    77                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    78                                         <a href="javascript:requestPage('edit/org_unit/detail')">Edit Detail</a>
    79                                 </li>
    80                                 <li id="publishButton" class="Button" title="Publish to the public view site">
    81                                                         <a href="javascript:confirmPublish()">Publish</a>
    82                                 </li>
    83                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    84                                         <a href="javascript:requestPage('edit/org_unit/list')">Save</a>
    85                                 </li>
    86                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    87                                                         <a href="javascript:confirmReset()">Reset</a>
    88                                 </li>
    89                         </ul>
    90                 </div>
     70<c:set var="navigationMenuContextItems">
     71        <%@ include file="_menu_items.jsp"%>
     72        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     73                <a href="javascript:requestPage('edit/org_unit/detail')">Edit Detail</a>
     74        </li>
     75        <li id="publishButton" class="Button" title="Publish to the public view site">
     76                <a href="javascript:confirmPublish()">Publish</a>
     77        </li>
     78        <li id="saveButton" class="Button" title="Commit/save the changes">
     79                <a href="javascript:requestPage('edit/org_unit/list')">Save</a>
     80        </li>
     81        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     82                <a href="javascript:confirmReset()">Reset</a>
     83        </li>
     84</c:set>
     85<%@ include file="../_navigation_menu.jsp"%>
    9186
    9287                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/system/_menu_items.jsp

    r2941 r13329  
    1 <%@ include file="../_menu_items.jsp"%>
     1<%-- dummy elements for the menuing code to not complain. --%>
    22
    3 <%-- dummy elements for the menuing code to not complain. --%>
    4 <span id="system/command"></span>
    5 <span id="system/file"></span>
     3<li id="system/command"></li>
     4<li id="system/file"></li>
    65
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/system/command.jsp

    r13328 r13329  
    6060        <div id="content">
    6161
    62                 <div id="navigationMenu">
    63                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    64                         <h2>Navigation Menu</h2>
    65                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    66 
    67 <%@ include file="_menu_items.jsp"%>
    68 
    69                                 <li id="runButton" class="Button" title="Runs the selected command">
    70                                         <a href="javascript:document.form.submit()">Run Selected Command</a>
    71                                 </li>
    72                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    73                                         <a href="javascript:confirmReset()">Reset</a>
    74                                 </li>
    75                         </ul>
    76                 </div>
     62<c:set var="navigationMenuContextItems">
     63        <%@ include file="_menu_items.jsp"%>
     64        <li id="runButton" class="Button" title="Runs the selected command">
     65                <a href="javascript:document.form.submit()">Run Selected Command</a>
     66        </li>
     67        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     68                <a href="javascript:confirmReset()">Reset</a>
     69        </li>
     70</c:set>
     71<%@ include file="../_navigation_menu.jsp"%>
    7772
    7873                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/system/text_file.jsp

    r13328 r13329  
    5050        <div id="content">
    5151
    52                 <div id="navigationMenu">
    53                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    54                         <h2>Navigation Menu</h2>
    55                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    56 
    57 <%@ include file="_menu_items.jsp"%>
    58 
    59                                 <li id="editButton" class="Button" title="Open the specified file to edit or view">
    60                                                         <a href="javascript:postRequest('edit/system/file')">Open File</a>
    61                                 </li>
    62                                 <li id="saveButton" class="Button" title="Commit/save the file changes">
    63                                                         <a href="javascript:postRequest('save/system/file')">Save</a>
    64                                 </li>
    65                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    66                                                         <a href="javascript:confirmReset()">Reset</a>
    67                                 </li>
    68 <c:if test="${textFile.fileSize > 0}">
    69                                 <li id="deleteButton" class="Button Show" title="Delete this record">
    70                                                         <a href="javascript:confirmDelete('delete/system/file')">Delete</a>
    71                                 </li>
    72 </c:if>
    73                         </ul>
    74                 </div>
     52<c:set var="navigationMenuContextItems">
     53        <%@ include file="_menu_items.jsp"%>
     54        <li id="editButton" class="Button" title="Open the specified file to edit or view">
     55                <a href="javascript:postRequest('edit/system/file')">Open File</a>
     56        </li>
     57        <li id="saveButton" class="Button" title="Commit/save the file changes">
     58                <a href="javascript:postRequest('save/system/file')">Save</a>
     59        </li>
     60        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     61                <a href="javascript:confirmReset()">Reset</a>
     62        </li>
     63        <c:if test="${textFile.fileSize > 0}">
     64        <li id="deleteButton" class="Button Show" title="Delete this record">
     65                <a href="javascript:confirmDelete('delete/system/file')">Delete</a>
     66        </li>
     67        </c:if>
     68</c:set>
     69<%@ include file="../_navigation_menu.jsp"%>
    7570
    7671                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/topic/_menu_items.jsp

    r11346 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="topic/list"  ><a href="javascript:requestPage('edit/topic/list')"   title="List of">Topic List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/topic/detail.jsp

    r13328 r13329  
    4141        <div id="content">
    4242
    43                 <div id="navigationMenu">
    44                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    45                         <h2>Navigation Menu</h2>
    46                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    47 
    48 <%@ include file="_menu_items.jsp"%>
    49 
    50                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    51                                         <a href="javascript:requestPage('edit/topic/detail')">Save</a>
    52                                 </li>
    53                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    54                                                         <a href="javascript:confirmReset()">Reset</a>
    55                                 </li>
    56                         </ul>
    57                 </div>
     43<c:set var="navigationMenuContextItems">
     44        <%@ include file="_menu_items.jsp"%>
     45        <li id="saveButton" class="Button" title="Commit/save the changes">
     46                <a href="javascript:requestPage('edit/topic/detail')">Save</a>
     47        </li>
     48        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     49                <a href="javascript:confirmReset()">Reset</a>
     50        </li>
     51</c:set>
     52<%@ include file="../_navigation_menu.jsp"%>
    5853
    5954                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/topic/list.jsp

    r13328 r13329  
    5858        <div id="content">
    5959
    60                 <div id="navigationMenu">
    61                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    62                         <h2>Navigation Menu</h2>
    63                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    64 
    65 <%@ include file="_menu_items.jsp"%>
    66                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    67                                         <a href="javascript:requestPage('edit/topic/detail')">Edit Detail</a>
    68                                 </li>
    69                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    70                                         <a href="javascript:requestPage('edit/topic/list')">Save</a>
    71                                 </li>
    72                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    73                                                         <a href="javascript:confirmReset()">Reset</a>
    74                                 </li>
    75                         </ul>
    76                 </div>
     60<c:set var="navigationMenuContextItems">
     61        <%@ include file="_menu_items.jsp"%>
     62        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     63                <a href="javascript:requestPage('edit/topic/detail')">Edit Detail</a>
     64        </li>
     65        <li id="saveButton" class="Button" title="Commit/save the changes">
     66                <a href="javascript:requestPage('edit/topic/list')">Save</a>
     67        </li>
     68        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     69                <a href="javascript:confirmReset()">Reset</a>
     70        </li>
     71</c:set>
     72<%@ include file="../_navigation_menu.jsp"%>
    7773
    7874                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/user/_menu_items.jsp

    r13316 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="user/list"  ><a href="javascript:requestPage('edit/user/list')" title="List of">User List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/user/authorities.jsp

    r13328 r13329  
    3737        <div id="content">
    3838
    39                 <div id="navigationMenu">
    40                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    41                         <h2>Navigation Menu</h2>
    42                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
     39<c:set var="navigationMenuContextItems">
     40        <%@ include file="_menu_items.jsp"%>
    4341
    44 <%@ include file="_menu_items.jsp"%>
    45                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    46                                         <a href="javascript:requestPage('edit/user/authorities/${user.ID}.html')">Save</a>
    47                                 </li>
    48                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    49                                                         <a href="javascript:confirmReset()">Reset</a>
    50                                 </li>
    51                         </ul>
    52                 </div>
     42        <li id="saveButton" class="Button" title="Commit/save the changes">
     43                <a href="javascript:requestPage('edit/user/authorities/${user.ID}.html')">Save</a>
     44        </li>
     45        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     46                <a href="javascript:confirmReset()">Reset</a>
     47        </li>
     48</c:set>
     49<%@ include file="../_navigation_menu.jsp"%>
    5350
    5451                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/user/detail.jsp

    r13328 r13329  
    4848        <div id="content">
    4949
    50                 <div id="navigationMenu">
    51                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    52                         <h2>Navigation Menu</h2>
    53                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    54 
    55 <%@ include file="_menu_items.jsp"%>
    56 
    57                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    58                                         <a href="javascript:requestPage('edit/user/detail/${user.ID}.html')">Save</a>
    59                                 </li>
    60                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    61                                                         <a href="javascript:confirmReset()">Reset</a>
    62                                 </li>
     50<c:set var="navigationMenuContextItems">
     51        <%@ include file="_menu_items.jsp"%>
     52        <li id="saveButton" class="Button" title="Commit/save the changes">
     53                <a href="javascript:requestPage('edit/user/detail/${user.ID}.html')">Save</a>
     54        </li>
     55        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     56                <a href="javascript:confirmReset()">Reset</a>
     57        </li>
    6358<%--
    64                                 <li id="deleteButton" class="Button" title="Delete this record">
    65                                                         <a href="javascript:confirmDelete('delete/user/detail">Delete</a>
    66                                 </li>
     59        <li id="deleteButton" class="Button" title="Delete this record">
     60                <a href="javascript:confirmDelete('delete/user/detail">Delete</a>
     61        </li>
    6762--%>
    68                         </ul>
    69                 </div>
     63</c:set>
     64<%@ include file="../_navigation_menu.jsp"%>
    7065
    7166                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/user/list.jsp

    r13328 r13329  
    2525        <div id="content">
    2626
    27                 <div id="navigationMenu">
    28                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    29                         <h2>Navigation Menu</h2>
    30                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    31 
    32 <%@ include file="_menu_items.jsp"%>
    33 
    34                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    35                                         <a href="javascript:requestPage('edit/user/detail')">Edit Detail</a>
    36                                 </li>
    37                                 <li id="newButton" class="Button" title="Creates/adds a new item">
    38                                         <a href="javascript:requestPage('edit/user/detail/-NEW-.html')">Add New</a>
    39                                 </li>
    40                         </ul>
    41                 </div>
     27<c:set var="navigationMenuContextItems">
     28        <%@ include file="_menu_items.jsp"%>
     29        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     30                <a href="javascript:requestPage('edit/user/detail')">Edit Detail</a>
     31        </li>
     32        <li id="newButton" class="Button" title="Creates/adds a new item">
     33                <a href="javascript:requestPage('edit/user/detail/-NEW-.html')">Add New</a>
     34        </li>
     35</c:set>
     36<%@ include file="../_navigation_menu.jsp"%>
    4237
    4338                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/user/roles.jsp

    r13328 r13329  
    3737        <div id="content">
    3838
    39                 <div id="navigationMenu">
    40                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    41                         <h2>Navigation Menu</h2>
    42                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    43 
    44 <%@ include file="_menu_items.jsp"%>
    45                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    46                                         <a href="javascript:requestPage('edit/user/roles/${user.ID}.html')">Save</a>
    47                                 </li>
    48                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    49                                                         <a href="javascript:confirmReset()">Reset</a>
    50                                 </li>
    51                         </ul>
    52                 </div>
     39<c:set var="navigationMenuContextItems">
     40        <%@ include file="_menu_items.jsp"%>
     41        <li id="saveButton" class="Button" title="Commit/save the changes">
     42                <a href="javascript:requestPage('edit/user/roles/${user.ID}.html')">Save</a>
     43        </li>
     44        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     45                <a href="javascript:confirmReset()">Reset</a>
     46        </li>
     47</c:set>
     48<%@ include file="../_navigation_menu.jsp"%>
    5349
    5450                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_attribute/_menu_items.jsp

    r13315 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="value_attribute/list"  class="MultiLine">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_attribute/detail.jsp

    r13328 r13329  
    4141        <div id="content">
    4242
    43                 <div id="navigationMenu">
    44                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    45                         <h2>Navigation Menu</h2>
    46                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    47 
    48 <%@ include file="_menu_items.jsp"%>
    49 
    50                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    51                                         <a href="javascript:requestPage('edit/value_attribute/detail')">Save</a>
    52                                 </li>
    53                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    54                                                         <a href="javascript:confirmReset()">Reset</a>
    55                                 </li>
    56                         </ul>
    57                 </div>
     43<c:set var="navigationMenuContextItems">
     44        <%@ include file="_menu_items.jsp"%>
     45        <li id="saveButton" class="Button" title="Commit/save the changes">
     46                <a href="javascript:requestPage('edit/value_attribute/detail')">Save</a>
     47        </li>
     48        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     49                <a href="javascript:confirmReset()">Reset</a>
     50        </li>
     51</c:set>
     52<%@ include file="../_navigation_menu.jsp"%>
    5853
    5954                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_attribute/list.jsp

    r13328 r13329  
    7171        <div id="content">
    7272
    73                 <div id="navigationMenu">
    74                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    75                         <h2>Navigation Menu</h2>
    76                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    77 
    78 <%@ include file="_menu_items.jsp"%>
    79 
    80                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    81                                         <a href="javascript:requestPage('edit/value_attribute/detail')">Edit Detail</a>
    82                                 </li>
    83                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    84                                         <a href="javascript:requestPage('edit/value_attribute/list')">Save</a>
    85                                 </li>
    86                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    87                                                         <a href="javascript:confirmReset()">Reset</a>
    88                                 </li>
     73<c:set var="navigationMenuContextItems">
     74        <%@ include file="_menu_items.jsp"%>
     75        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     76                <a href="javascript:requestPage('edit/value_attribute/detail')">Edit Detail</a>
     77        </li>
     78        <li id="saveButton" class="Button" title="Commit/save the changes">
     79                <a href="javascript:requestPage('edit/value_attribute/list')">Save</a>
     80        </li>
     81        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     82                <a href="javascript:confirmReset()">Reset</a>
     83        </li>
    8984<!--
    90                                 <li id="deleteButton" class="Button Show" title="Delete this record">
    91                                                         <a href="javascript:confirmDelete('delete/title/list')">Delete</a>
    92                                 </li>
     85        <li id="deleteButton" class="Button Show" title="Delete this record">
     86                <a href="javascript:confirmDelete('delete/title/list')">Delete</a>
     87        </li>
    9388-->
    94                         </ul>
    95                 </div>
     89</c:set>
     90<%@ include file="../_navigation_menu.jsp"%>
    9691
    9792                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_type/_menu_items.jsp

    r11346 r13329  
    11<%-- Menu Snippet that contains left selection items for this group of pages --%>
    2 
    3 <%@ include file="../_menu_items.jsp"%>
    42
    53<li id="value_type/list"  ><a href="javascript:requestPage('edit/value_type/list')"   title="List of">Value Type List</a></li>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_type/detail.jsp

    r13328 r13329  
    4141        <div id="content">
    4242
    43                 <div id="navigationMenu">
    44                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    45                         <h2>Navigation Menu</h2>
    46                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    47 
    48 <%@ include file="_menu_items.jsp"%>
    49 
    50                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    51                                         <a href="javascript:requestPage('edit/value_type/detail')">Save</a>
    52                                 </li>
    53                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    54                                                         <a href="javascript:confirmReset()">Reset</a>
    55                                 </li>
    56                         </ul>
    57                 </div>
     43<c:set var="navigationMenuContextItems">
     44        <%@ include file="_menu_items.jsp"%>
     45        <li id="saveButton" class="Button" title="Commit/save the changes">
     46                <a href="javascript:requestPage('edit/value_type/detail')">Save</a>
     47        </li>
     48        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     49                <a href="javascript:confirmReset()">Reset</a>
     50        </li>
     51</c:set>
     52<%@ include file="../_navigation_menu.jsp"%>
    5853
    5954                <div class="Sections">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_type/list.jsp

    r13328 r13329  
    7171        <div id="content">
    7272
    73                 <div id="navigationMenu">
    74                         <a name="navigationMenuJumpTo" title="page's site navigation menu jump to"></a>
    75                         <h2>Navigation Menu</h2>
    76                         <ul class="VerticalPopoutList RightControl" id="navigationMenuList">
    77 
    78 <%@ include file="_menu_items.jsp"%>
    79 
    80                                 <li id="editButton" class="Button" title="Edit the detail of the selected item">
    81                                         <a href="javascript:requestPage('edit/value_type/detail')">Edit Detail</a>
    82                                 </li>
    83                                 <li id="saveButton" class="Button" title="Commit/save the changes">
    84                                         <a href="javascript:requestPage('edit/value_type/list')">Save</a>
    85                                 </li>
    86                                 <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
    87                                                         <a href="javascript:confirmReset()">Reset</a>
    88                                 </li>
     73<c:set var="navigationMenuContextItems">
     74        <%@ include file="_menu_items.jsp"%>
     75        <li id="editButton" class="Button" title="Edit the detail of the selected item">
     76                <a href="javascript:requestPage('edit/value_type/detail')">Edit Detail</a>
     77        </li>
     78        <li id="saveButton" class="Button" title="Commit/save the changes">
     79                <a href="javascript:requestPage('edit/value_type/list')">Save</a>
     80        </li>
     81        <li id="resetButton" class="Button" title="Reset page to how it was before changes were made">
     82                <a href="javascript:confirmReset()">Reset</a>
     83        </li>
    8984<!--
    90                                 <li id="deleteButton" class="Button Show" title="Delete this record">
    91                                                         <a href="javascript:confirmDelete('delete/title/list')">Delete</a>
    92                                 </li>
     85        <li id="deleteButton" class="Button Show" title="Delete this record">
     86                <a href="javascript:confirmDelete('delete/title/list')">Delete</a>
     87        </li>
    9388-->
    94                         </ul>
    95                 </div>
     89</c:set>
     90<%@ include file="../_navigation_menu.jsp"%>
    9691
    9792                <div class="Sections">
Note: See TracChangeset for help on using the changeset viewer.