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

 Dim sDiffStateIcon
 Dim sStyle
 Dim sCompVerText
 Dim sVerText
 '------------ Constants Declaration -----------
-Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='2' align='absmiddle' title='Updated'>"
+Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='2' title='Updated'>"
-Const LIMG_ADDED = "<img src='images/i_added.gif' width='11' height='11' border='0' hspace='2' align='absmiddle' title='Added'>"
+Const LIMG_ADDED = "<img src='images/i_added.gif' width='11' height='11' border='0' hspace='2' title='Added'>"
-Const LIMG_REMOVED = "<img src='images/i_removed.gif' width='11' height='11' border='0' hspace='2' align='absmiddle' title='Removed'>"
+Const LIMG_REMOVED = "<img src='images/i_removed.gif' width='11' height='11' border='0' hspace='2' title='Removed'>"
+Const LIMG_UNCHANGED = "<img src='images/i_unchanged.gif' width='11' height='11' border='0' hspace='5' title='Unchanged'>"
 '------------ Variable Init -------------------
 parComparePvId = Request("compare_pv_id")
 parCompare = Request("compare")
 '----------------------------------------------
 If Request("btn") = "Compare" Then
+           }
         });
        updateTableIcons();
     });
+    //
+    //  File Diff display
+    //  Wire up the Show/Hide options
+    //
+	$('#btnHideUpdate').change(function(){
+		toggleRows( $(this).is(':checked'), '.ftUpdated' );
+    });
+    $('#btnHideAdded').change(function(){
+		toggleRows( $(this).is(':checked'), '.ftAdded' );
+    });
+	$('#btnHideRemoved').change(function(){
+		toggleRows( $(this).is(':checked'), '.ftRemoved' );
+    });
+	$('#btnHideSame').change(function(){
+		toggleRows( $(this).is(':checked'), '.ftSame' );
+    });
+    function toggleRows( mode, sClass) {
+        if ( mode ) {
+            $('#fileList tr').filter(sClass).hide();
+        } else {
+            $('#fileList tr').filter(sClass).show();
+        }
+    }
 });
 </script>
 <%
 '--------------------------------------------------------------------------------------------------------------------------------------
 Sub DisplayMessage ()
     OraDatabase.Parameters.Remove "PKG_ID"
     OraDatabase.Parameters.Remove "V_EXT"
 End Sub
 '--------------------------------------------------------------------------------------------------------------------------------------
-Sub GetDiffStateIcon( nDiffState, outIcon, outStyle )
+Sub GetDiffStateIcon( nDiffState, outIcon, outStyle, outRowStyle )
     Select Case CInt( nDiffState )
         Case enumDB_NUM_DIFF_UPDATED
             outIcon  = LIMG_UPDATED
             outStyle = "body_rowbold"
+			outRowStyle = "ftUpdated"
         Case enumDB_NUM_DIFF_REMOVED
             outIcon = LIMG_REMOVED
             outStyle = "body_rowthru"
+			outRowStyle = "ftRemoved"
         Case enumDB_NUM_DIFF_NEW
             outIcon = LIMG_ADDED
             outStyle = "body_rowbold"
+			outRowStyle = "ftAdded"
         Case Else
             outIcon = ""
             outStyle = "body_rowg"
+			outRowStyle = "ftSame"
     End Select
 End Sub
 '--------------------------------------------------------------------------------------------------------------------------------------
 Sub DisplayDiffSummary( orsQry )
     Dim dDiffSummary
     Set dDiffSummary = CreateObject("Scripting.Dictionary")
     dDiffSummary.Item ("UPDATED") = 0
     dDiffSummary.Item ("REMOVED") = 0
     dDiffSummary.Item ("ADDED") = 0
+    dDiffSummary.Item ("SAME") = 0
     While ((NOT orsQry.BOF) AND (NOT orsQry.EOF))
         Select Case CInt( orsQry("diff_state") )
             Case enumDB_NUM_DIFF_UPDATED
             Case enumDB_NUM_DIFF_REMOVED
                 dDiffSummary.Item ("REMOVED") = CInt( dDiffSummary.Item ("REMOVED") ) + 1
             Case enumDB_NUM_DIFF_NEW
                 dDiffSummary.Item ("ADDED") = CInt( dDiffSummary.Item ("ADDED") ) + 1
+            Case Else
+                dDiffSummary.Item ("SAME") = CInt( dDiffSummary.Item ("SAME") ) + 1
         End Select
         orsQry.MoveNext
     WEnd
     ' Reset cursor
     orsQry.MoveFirst()
     ' Display Summary
-    Response.write dDiffSummary.Item ("UPDATED") &" -<img src='images/i_updated.gif' width='11' height='11' hspace='3'>Updated, "
+    Response.write dDiffSummary.Item ("UPDATED") &" - "& LIMG_UPDATED   & "Updated, "
-    Response.write dDiffSummary.Item ("ADDED") &" -<img src='images/i_added.gif' width='11' height='11' hspace='3'>Added, "
+    Response.write dDiffSummary.Item ("ADDED")   &" - "& LIMG_ADDED     & "Added, "
-    Response.write dDiffSummary.Item ("REMOVED") &" -<img src='images/i_removed.gif' width='11' height='11' hspace='3'>Removed"
+    Response.write dDiffSummary.Item ("REMOVED") &" - "& LIMG_REMOVED   & "Removed, "
+    Response.write dDiffSummary.Item ("SAME")    &" - "& LIMG_UNCHANGED & "Unchanged"
 End Sub
 '--------------------------------------------------------------------------------------------------------------------------------------
 %>
     <!-- DETAILS ------------------------------------------------->
       ' with another version
     %>
     <%If pkgCompare Then %>
             <form name="formname" method="get" action="<%=ScriptName%>" onSubmit="ProgressBar.style.visibility='visible';">
             <br>
-            <span class="body_colb">Files and Folders</span><br>
             <%If rsQry.Recordcount > 0 Then%>
             <table width="100%"  border="0" cellspacing="1" cellpadding="3">
               <tr>
+				<td nowrap width=1% class="body_colb">Files and Folders</td>
-                <td nowrap class="body_txt">
+                <td nowrap width=1% class="body_txt">
+					<fieldset class="fset body_row">
-                    Show differences since version
+						<legend>Show differences since version</legend>
                     <select name="compare_pv_id" class="form_item">
                     <%Call DisplayComparePvIdCombo()%>
                     </select>
                     <input name="btn" type="submit" class="form_btn" value="Compare">
                     <%If parCompare <> "" Then%>
-                    &nbsp;&nbsp;&nbsp;
+					<input type="checkbox" style='visibility:hidden'>
                     <a class="form_btn" href="<%=scriptName%>?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>">Show <%=sVerText%></a>
                     <a class="form_btn" href="<%=scriptName%>?pv_id=<%=parComparePvId%>&rtag_id=<%=parRtag_id%>">Show <%=sCompVerText%></a>
+					</fieldset>
+					</td>
+					<td width=1% nowrap class="body_txt">
+					<fieldset class="fset body_row">
+						<legend>Hide / Show</legend>
+						<input type="checkbox" id='btnHideUpdate' ><%=LIMG_UPDATED%>Updated
+						<input type="checkbox" id='btnHideAdded'  ><%=LIMG_ADDED%>Added
+						<input type="checkbox" id='btnHideRemoved'><%=LIMG_REMOVED%>Removed
+						<input type="checkbox" id='btnHideSame'   ><%=LIMG_UNCHANGED%>Unchanged
+					</fieldset>
                     <%End If%>
                 </td>
+				<td></td>
-                <td nowrap class="body_txt" align="right">
+                <td nowrap width=1% class="body_txt" align="right">
                     <%If parCompare <> "" Then%>
+					<fieldset class="fset body_row">
+						<legend>Summary</legend>
                         <%Call DisplayDiffSummary( rsQry ) %>
+					</fieldset>
                     <%End If%>
                 </td>
               </tr>
             </table>
             <hr size="1" noshade color="#999999">
+		    <%Else%>
+				<span class="body_colb">Files and Folders</span><br>
+				<hr size="1" noshade color="#999999">
+				<span class="body_txt">No files recorded</span>
             <%End If%>
     <%End If%>
     <!-- MODULE COMPONENTS ++++++++++++++++++++++++++++++++++++++ -->
             While ((NOT rsQry.BOF) AND (NOT rsQry.EOF))
                 Dim sizeStyle : sizeStyle = ""
                 Dim sumStyle  : sumStyle = ""
                 Dim diffState : diffState = rsQry("diff_state")
                 Dim sSum, sCompSum, filePath
+                Dim sRowClass
                 sSum = rsQry("crc_cksum")
                 sCompSum = rsQry("comp_crc_cksum")
                 sSize = rsQry("byte_size")
                 sCompSize = rsQry("comp_byte_size")
-                Call GetDiffStateIcon( diffState, sDiffStateIcon, sStyle )
+                Call GetDiffStateIcon( diffState, sDiffStateIcon, sStyle, sRowClass )
                 filePath = rsQry("file_path")
                 If IsNull(filePath) Then filePath = ""
                 ' Find if this is file or folder
                 If Len(filePath) > 0 AND Right(filePath,1) <> "/" Then
                     End If
                 End If
             %>
-            <tr class="form_item_grey">
+            <tr class="form_item_grey <%=sRowClass%>">
               <td nowrap ><%=sDiffStateIcon%></td>
               <td nowrap class="<%=sStyle%>"><%=sIcon & rsQry("name")%></td>
               <td nowrap class="<%=sizeStyle%>" align="right"><%=sSize%></td>
               <td nowrap class="<%=sumStyle%>"  align="right"><%=sSum%></td>
               <td nowrap class="<%=sizeStyle%>" align="right"><%=sCompSize%></td>

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/web/_files_and_folders.asp – Rev 6790 → 7249