WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/web/_action_buttons.asp

 Sub Action_Buttons_State ( SSwithTab, bState )
    Dim isClosed, isSDK, isActive
    isClosed = (releaseIsClosed(ReleaseMode))
    isActive = TRUE
    Select Case SSwithTab%>
    <%Case "Build Dependencies"%>
       <table width="10" border="0" cellspacing="10">
          <tr>
             <%  isActive = NOT isClosed AND NOT pkgInfoHash.Item ("is_sdkpkg") AND ( (pkgInfoHash.Item ("dlocked") = "N") OR (pkgInfoHash.Item ("dlocked") = "R") OR criticalSectionIsEditable )
-                BuildActionButton isActive, "Add", "Add dependency to the list.", _
+                BuildActionButtonLink isActive, "Add", "Add dependency to the list.", _
                                          "src='images/i_add_deps.gif' width='22' height='25' align='absmiddle' border='0' hspace='3'", _
                                          "form_search_pkgs.asp?pv_id=" & parPv_id & "&rtag_id=" & parRtag_id & "&add_type=" & enum_ADD_DEPENDENCIES
-                BuildActionButton isActive, "Edit", "Edit dependency list.", _
+                BuildActionButtonLink isActive, "Edit", "Edit dependency list.", _
                                          "src='images/i_edit_deps.gif' width='23' height='24' align='absmiddle' border='0' hspace='3'", _
                                          "form_edit_deps.asp?pv_id=" & parPv_id & "&rtag_id=" & parRtag_id
-                BuildActionButton isActive, "Import", "Import dependency list from your build file.", _
+                BuildActionButtonLink isActive, "Import", "Import dependency list from your build file.", _
                                          "src='images/i_import_on.gif' width='22' height='22' align='absmiddle' border='0' hspace='3'", _
                                          "form_update_"&Get_Devl_Environment&"_dependencies.asp?pv_id="&parPv_id&"&rtag_id="&parRtag_id
-                BuildActionButton TRUE, "Export", "Export this dependency list to be used in your build file.", _
+                BuildActionButtonLink TRUE, "Export", "Export this dependency list to be used in your build file.", _
                                          "src='images/i_export_on.gif' width='22' height='22' align='absmiddle' border='0' hspace='3'", _
                                          "form_export_"&Get_Devl_Environment&"_dependencies.asp?pv_id="&parPv_id&"&rtag_id="&parRtag_id%>
          </tr>
       </table>
                   BuildActionButton isActive, "Add", "Add runtime dependency to the list.", _
                                          "src='images/i_add_deps.gif' width='22' height='25' align='absmiddle' border='0' hspace='3'", _
                                          "form_search_pkgs.asp?pv_id=" & parPv_id & "&rtag_id=" & parRtag_id & "&add_type=" & enum_ADD_RUNTIME_DEPENDENCIES%>
             </tr>
          </table>
+<!-- Not currently used -->
-   <%Case "Used By"%>
+<!-- <%Case "Used By"%> -->
-         <table width="10" border="0" cellspacing="10">
+<!--     <table width="10" border="0" cellspacing="10">                                                                                        -->
-            <tr>
+<!--        <tr>                                                                                                                               -->
-                <%isActive = IsNull(pkgInfoHash.Item ("is_patch"))
+<!--            isActive = IsNull(pkgInfoHash.Item ("is_patch"))                                                                             -->
-                  BuildActionButton isActive, "Show All", "Show the complete list packages that use this package", _
+<!--              BuildActionButton isActive, "Show All", "Show the complete list packages that use this package", _                           -->
-                                         "src='images/i_used_by_large.gif' width='22' height='25' align='absmiddle' border='0' hspace='3'", _
+<!--                                     "src='images/i_used_by_large.gif' width='22' height='25' align='absmiddle' border='0' hspace='3'", _  -->
-                                         "used_by_all.asp?pv_id=" & parPv_id & "&rtag_id=" & parRtag_id %>
+<!--                                     "used_by_all.asp?pv_id=" & parPv_id & "&rtag_id=" & parRtag_id                                      -->
+<!--                                                                                                                                           -->
-            </tr>
+<!--              BuildActionButton isActive, "Show All Depends", "Show the complete list packages that are requred to build this package", _-->
-         </table>
+<!--                                     "src='images/i_used_by_large.gif' width='22' height='25' align='absmiddle' border='0' hspace='3'", _  -->
+<!--                                     "dependencies_all.asp?pv_id=" & parPv_id & "&rtag_id=" & parRtag_id                                 -->
+<!--        </tr>                                                                                                                              -->
+<!--     </table>                                                                                                                              -->
    <%Case "Patches"%>
       <table width="10" border="0" cellspacing="10">
          <tr>
-            <%If NOT isClosed AND NOT pkgInfoHash.Item ("is_sdkpkg") AND (pkgInfoHash.Item ("dlocked") = "Y") Then%>
+            <%If NOT isClosed AND NOT pkgInfoHash.Item ("is_sdkpkg") AND (pkgInfoHash.Item ("dlocked") = "Y") Then
-               <td align="center" nowrap valign="bottom">
+                BuildActionButtonClick TRUE, "Add", "Add a patch to this package.", FALSE, _
-                  <a href="javascript:;" onClick="MM_openVixIFrame('_wform_new_patch.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','New Patch')" class="abtnItem">
+                                             "src='images/i_add_patch.gif' width='23' height='25' align='absmiddle' border='0' hspace='3'", _
-                     <img src="images/i_add_patch.gif" width="23" height="25" align="absmiddle" border="0" hspace="3" title="Add a patch to this package.">
+                                             "MM_openVixIFrame('_wform_new_patch.asp?pv_id="&parPv_id&"&rtag_id="&parRtag_id&"','New Patch')"
-                     Add
-                  </a>
-               </td>
-               <td align="center" nowrap valign="bottom">
-                  <a href="javascript:;" onClick="MM_openVixIFrame('_wform_obsolete_all_patches.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','Obsolete Patches')" class="abtnItem">
+                BuildActionButtonClick TRUE, "Roll-up Obsolete Patches", "Obsolete patches in one go.", FALSE, _
-                     <img src="images/abtn_obsolete_patch.gif" width="23" height="25" align="absmiddle" border="0" hspace="3" title="Obsolete patches in one go.">
+                                             "src='images/abtn_obsolete_patch.gif' width='23' height='25' align='absmiddle' border='0' hspace='3'", _
-                     Roll-up Obsolete Patches
+                                             "MM_openVixIFrame('_wform_obsolete_all_patches.asp?pv_id="&parPv_id&"&rtag_id="&parRtag_id&"','Obsolete Patches')"
-                  </a>
-               </td>
-               <%If canShowControlInProject("ReleasePatch") Then%>
+               If canShowControlInProject("ReleasePatch") Then
-                  <td align="center" nowrap valign="bottom">
-                     <a href="javascript:;" onClick="MM_openVixIFrame('_wform_make_release_bulk_patches.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','Bulk Patch Release')" class="abtnItem">
+                    BuildActionButtonClick isActive, "Make Release Bulk Patches", "Make Release patches in one go.", FALSE, _
-                        <img src="images/abtn_make_release_bulk_patches.gif" width="25" height="25" align="absmiddle" border="0" hspace="3" title="Make Release patches in one go.">
+                                             "src='images/abtn_make_release_bulk_patches.gif' width='23' height='25' align='absmiddle' border='0' hspace='3'", _
-                        Make Release Bulk Patches
+                                             "MM_openVixIFrame('_wform_make_release_bulk_patches.asp?pv_id="&parPv_id&"&rtag_id="&parRtag_id&"','Bulk Patch Release')"
-                     </a>
-                  </td>
-               <%End If%>
+               End If
-            <%End If%>
+            End If%>
          </tr>
       </table>
    <%Case "Release Notes"%>
       <table width="10" border="0" cellspacing="10">
          <tr>
             <%
                 IsActive = (pkgInfoHash.Item ("dlocked") = "Y") AND (InStr(pkgInfoHash.Item ("release_notes_info"),"MSG:") < 1) AND NOT IsNull(pkgInfoHash.Item ("release_notes_info"))
-                BuildActionButton isActive, "Download", "Download full release notes.", _
+                BuildActionButtonLink isActive, "Download", "Download full release notes.", _
                                              "src='images/btn_download.gif' width='22' height='22' align='absmiddle' border='0' hspace='3'", _
                                              HTTP_PKG_ARCHIVE & pkgInfoHash.Item ("release_notes_info")
                 IsActive = canActionControlInProject("EditCriticalInfoForLockedPackage") AND NOT isClosed AND ((pkgInfoHash.Item ("dlocked") = "Y") AND (pkgInfoHash.Item ("release_notes_info") <> enum_RELEASE_NOTES_NOT_FOUND_IN_ARCHIVE))
-                BuildActionButton2I isActive, "Regenerate Notes", "Regenerate Release Notes.", _
+                BuildActionButton isActive, "Regenerate Notes", "Regenerate Release Notes.", _
                                              "src='images/i_sync_on.gif' width='22' height='22' align='absmiddle' border='0' hspace='3'", _
-                                             "src='images/i_sync_off.gif' width='22' height='22' align='absmiddle' border='0' hspace='3'", _
                                              "fixed_issues.asp?pv_id="&parPv_id&"&rtag_id="&parRtag_id&"&resetNotes=1"%>
          </tr>
       </table>
    <%Case "Documentation"%>
                                      "src='icons/tplay.gif' width='16' height='16' align='absmiddle' border='0' hspace='3'", _
                                      "location.href='_setResume.asp';" %>
          </tr>
       </table>
+   <%Case "Add Daemon Instruction"%>
+      <table width="10" border="0" cellspacing="10">
+         <tr>
+            <%BuildActionButtonClick bState, "Add Daemon Instruction", "Insert New Daemon Instruction.", TRUE, _
+                                        "src='icons/btn_add.gif' width='13' height='13' align='absmiddle' border='0' hspace='3'", _
+                                        "MM_openVixIFrame('wAddDaemonInstruction.asp','Insert New Daemon Instruction')"%>
+         </tr>
+      </table>
    <%Case "Daemon Start"%>
       <table border="0" cellspacing="0" cellpadding="0">
          <!-- Daemon Start -->
          <tr>
             <td valign=top>
                <img src="icons/tstopped.gif" width="16" height="16" border="0" vspace=2 hspace="5" title="Disabled">
             </td>
-            <%BuildActionButton bState, "", "Enable Daemon", _
+            <%BuildActionButtonClick bState, "", "Enable Daemon", FALSE, _
                                      "src='icons/tplay.gif' width='16' height='16' border='0' vspace='2' hspace='0'", _
-                                     "_setDaemonResume.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName%>
+                                     "location.href='_setDaemonResume.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName&"'"%>
             <%BuildActionButton FALSE, "", "Pause Daemon", "src='icons/tpause.gif' width='16' height='16' border='0' vspace='2' hspace='0'",""%>
             <%BuildActionButton FALSE, "", "Disable Daemon", "src='icons/tstop.gif' width='16' height='16' border='0' vspace='2' hspace='0'",""%>
          </tr>
             <td valign=top>
                <img src="icons/tplayed.gif" width="16" height="16" border="0" vspace=2 hspace="5" title="Enabled">
             </td>
             <%BuildActionButton FALSE, "", "Enable Daemon", "src='icons/tplay.gif' width='16' height='16' border='0' vspace='2' hspace='0'", ""%>
-            <%BuildActionButton bState, "", "Pause Daemon", _
+            <%BuildActionButtonClick bState, "", "Pause Daemon", FALSE, _
                                      "src='icons/tpause.gif' width='16' height='16' border='0' vspace='2' hspace='0'", _
-                                     "_setDaemonPause.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName%>
+                                     "location.href='_setDaemonPause.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName&"'"%>
-            <%BuildActionButton bState, "", "Disable Daemon", _
+            <%BuildActionButtonClick bState, "", "Disable Daemon", FALSE, _
                                      "src='icons/tstop.gif' width='16' height='16' border='0' vspace='2' hspace='0'", _
-                                     "_setDaemonDisable.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName%>
+                                     "location.href='_setDaemonDisable.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName&"'"%>
          </tr>
       </table>
    <%Case "Daemon Resume"%>
       <table border="0" cellspacing="0" cellpadding="0">
          <!-- Daemon Resume -->
          <tr>
             <td valign=top>
                <img src="icons/tpaused.gif" width="16" height="16" border="0" vspace=2 hspace="5" title="Paused">
             </td>
-            <%BuildActionButton bState, "", "Enable Daemon", _
+            <%BuildActionButtonClick bState, "", "Enable Daemon", FALSE, _
                                      "src='icons/tplay.gif' width='16' height='16' border='0' vspace='2' hspace='0'", _
-                                     "_setDaemonResume.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName%>
+                                     "location.href='_setDaemonResume.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName &"'"%>
             <%BuildActionButton FALSE, "", "Pause Daemon", "src='icons/tpause.gif' width='16' height='16' border='0' vspace='2' hspace='0'",""%>
-            <%BuildActionButton bState, "", "Disable Daemon", _
+            <%BuildActionButtonClick bState, "", "Disable Daemon", FALSE, _
                                      "src='icons/tstop.gif' width='16' height='16' border='0' vspace='2' hspace='0'", _
-                                     "_setDaemonDisable.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName%>
+                                     "location.href='_setDaemonDisable.asp?rcon_id="&rcon_id&"&rtag_id="&parRtagId&"&rfile="&scriptName&"'"%>
          </tr>
       </table>
    <%Case "Daemon Control All"%>
       <table border="0" cellspacing="0" cellpadding="0">
-         <!-- Daemon StartControl All -->
+         <!-- Daemon Control All -->
          <tr>
             <td valign=top>
                <img src=icons/tpaused.gif width="16" height="16" border="0" vspace=2 hspace="5" style="visibility:hidden">
             </td>
-            <%BuildActionButton bState, "", "Enable Daemons", _
+            <%BuildActionButtonClick bState, "", "Enable Daemons", FALSE, _
                                      "src='icons/tplay.gif' width='16' height='16' border='0' vspace='2' hspace='0'", _
-                                     "_setDaemonResume.asp?rtag_id="&parRtagId&"&rfile="&scriptName%>
+                                     "location.href='_setDaemonResume.asp?rtag_id="&parRtagId&"&rfile="&scriptName&"'"%>
-            <%BuildActionButton bState, "", "Pause Daemons", _
+            <%BuildActionButtonClick bState, "", "Pause Daemons", FALSE, _
                                      "src='icons/tpause.gif' width='16' height='16' border='0' vspace='2' hspace='0'", _
-                                     "_setDaemonPause.asp?rtag_id="&parRtagId&"&rfile="&scriptName%>
+                                     "location.href='_setDaemonPause.asp?rtag_id="&parRtagId&"&rfile="&scriptName&"'"%>
-            <%BuildActionButton bState, "", "Disable Daemons", _
+            <%BuildActionButtonClick bState, "", "Disable Daemons", FALSE, _
                                      "src='icons/tstop.gif' width='16' height='16' border='0' vspace='2' hspace='0'", _
-                                     "_setDaemonDisable.asp?rtag_id="&parRtagId&"&rfile="&scriptName%>
+                                     "location.href='_setDaemonDisable.asp?rtag_id="&parRtagId&"&rfile="&scriptName&"'"%>
          </tr>
       </table>
    <%Case "Daemon Unavailable"%>
       <table border="0" cellspacing="0" cellpadding="0">
             <%BuildActionButton FALSE, "", "Pause Daemons",   "src='icons/tpause.gif' width='16' height='16' border='0' vspace='2' hspace='0'",""%>
             <%BuildActionButton FALSE, "", "Disable Daemons", "src='icons/tstop.gif' width='16' height='16' border='0' vspace='2' hspace='0'","" %>
          </tr>
       </table>
-   <%Case "Add Daemon Instruction"%>
-      <table width="10" border="0" cellspacing="10">
-         <tr>
-            <%BuildActionButtonClick bState, "Add Daemon Instruction", "Insert New Daemon Instruction.", TRUE, _
-                                        "src='icons/btn_add.gif' width='13' height='13' align='absmiddle' border='0' hspace='3'", _
-                                        "MM_openVixIFrame('wAddDaemonInstruction.asp','Insert New Daemon Instruction')"%>
-         </tr>
-      </table>
    <%End Select%>
 <%End Sub%>
 <%
 '------------------------------------------------------------------------------
 '   Helper routine to create buttons and disabled buttons
+'   Treat the action an href - link the user can see and potentiall open in another tab
+'
-Sub BuildActionButton(bState, sText, sTitle, sImage, sRef)
+Sub BuildActionButtonLink(bState, sText, sTitle, sImage, sRef)
  %>
 <td align="center" nowrap valign="bottom" title="<%=sTitle%>">
     <%If bState Then%>
     <a href="<%=sRef%>" class="abtnItem"><img <%=sImage%> ><%=sText%></a>
     <%Else%>
     <%End If%>
 </td>
 <%End Sub
 '------------------------------------------------------------------------------
 '   Helper routine to create buttons and disabled buttons
-'   Tack a onClick operation
+'   Treat te ref as a page to goto, but don't use href
+'
-Sub BuildActionButtonClick(bState, sText, sTitle, isBlue, sImage, sClick)
+Sub BuildActionButton(bState, sText, sTitle, sImage, sRef)
- Dim sStyle : sStyle = ""
  %>
-<td align="right" nowrap valign="bottom" title="<%=sTitle%>">
+<td align="center" nowrap valign="bottom" title="<%=sTitle%>">
     <%If bState Then%>
-    <%If isBlue Then sStyle = "color:#0000ee; text-decoration:underline"%>
-    <span onClick="<%=sClick%>" class="pointer abtnItem"  style="<%=sStyle%>"><img <%=sImage%> ><%=sText%></span>
+    <span onClick="location.href='<%=sRef%>'" class="pointer abtnItem"><img <%=sImage%> ><%=sText%></span>
     <%Else%>
-    <%If isBlue Then sStyle = "color:#0000ee66; text-decoration:none"%>
-    <span class="abtnItemDis" style="<%=sStyle%>"><img <%=sImage%> class="lessOpacity"><%=sText%></span>
+    <span class="abtnItemDis"><img <%=sImage%> class="lessOpacity"><%=sText%></span>
     <%End If%>
 </td>
 <%End Sub
 '------------------------------------------------------------------------------
 '   Helper routine to create buttons and disabled buttons
-'   Takes on and off images
+'   Tack a onClick operation
+'
-Sub BuildActionButton2I(bState, sText, sTitle, sImage, sImage2, sRef)
+Sub BuildActionButtonClick(bState, sText, sTitle, isBlue, sImage, sClick)
+ Dim sStyle : sStyle = ""
  %>
-<td align="center" nowrap valign="bottom" title="<%=sTitle%>">
+<td align="right" nowrap valign="bottom" title="<%=sTitle%>">
     <%If bState Then%>
+    <%If isBlue Then sStyle = "color:#0000ee; text-decoration:underline"%>
-    <a href="<%=sRef%>" class="abtnItem"><img <%=sImage%> ><%=sText%></a>
+    <span onClick="<%=sClick%>" class="pointer abtnItem"  style="<%=sStyle%>"><img <%=sImage%> ><%=sText%></span>
     <%Else%>
+    <%If isBlue Then sStyle = "color:#0000ee66; text-decoration:none"%>
-    <span class="abtnItemDis"><img <%=sImage2%> class="lessOpacity"><%=sText%></span>
+    <span class="abtnItemDis" style="<%=sStyle%>"><img <%=sImage%> class="lessOpacity"><%=sText%></span>
     <%End If%>
 </td>
 <%End Sub%>

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/web/_action_buttons.asp – Rev 6786 → 6788