[Midnightbsd-cvs] mports: www/tmpls: move result-list.tmpl to port-list.tmpl only show

[ctriv at midnightbsd.org]

Log Message:
-----------
move result-list.tmpl to port-list.tmpl
only show reset links if the port belongs to an active run

Modified Files:
--------------
    mports/Tools/magus/www/tmpls:
        list.tmpl (r1.2 -> r1.3)
        port.tmpl (r1.6 -> r1.7)

Added Files:
-----------
    mports/Tools/magus/www/tmpls:
        port-list.tmpl (r1.1)

Removed Files:
-------------
    mports/Tools/magus/www/tmpls:
        result-list.tmpl

-------------- next part --------------
--- /dev/null
+++ Tools/magus/www/tmpls/port-list.tmpl
@@ -0,0 +1,33 @@
+<table class="result-list">
+	<tr>
+		<th>Port</th>
+		<th>Version</th>
+		<th>Status</th>
+		<th>Run</th>
+		<th>OSVersion</th>
+		<th>Arch</th>
+		<th></th>
+	</tr>
+	<TMPL_LOOP NAME=results>
+	<tr class="<TMPL_VAR NAME=summary><TMPL_UNLESS NAME=__odd__> even</TMPL_UNLESS>">
+		<td><a href="<TMPL_VAR name=port_root>/<TMPL_VAR NAME=id>"><TMPL_VAR NAME="port"></a></td>
+		<td><TMPL_VAR NAME=version></td>
+		<td><TMPL_VAR NAME=summary></td>
+		<td><a href="<TMPL_VAR NAME="run_root">/<TMPL_VAR NAME="run">"><TMPL_VAR NAME=run></a></td>
+		<td><TMPL_VAR NAME=osversion></td>
+		<td><TMPL_VAR NAME=arch></td>
+		<td>
+	            (<a href="<TMPL_VAR NAME="port_root">/<TMPL_VAR NAME="id">">Show Details</a>) 		  
+		   <TMPL_IF NAME="can_reset">
+		    ·
+	            (<a onclick="return confirm_reset()" href="/magus/auth/reset_port.cgi?id=<TMPL_VAR NAME=id>">Reset Port</a>)
+		  </TMPL_IF>
+        	</td>
+        </tr>
+        <tr class="details<TMPL_UNLESS NAME=__odd__> even</TMPL_UNLESS>" id="result_<TMPL_VAR NAME=id>_row">
+        	<td colspan="6" id="result_<TMPL_VAR NAME=id>_details"></td>
+        </tr>
+                
+	</TMPL_LOOP>
+</table>
+
Index: list.tmpl
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/tmpls/list.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -L Tools/magus/www/tmpls/list.tmpl -L Tools/magus/www/tmpls/list.tmpl -u -r1.2 -r1.3
--- Tools/magus/www/tmpls/list.tmpl
+++ Tools/magus/www/tmpls/list.tmpl
@@ -6,7 +6,7 @@
 
 <p><TMPL_VAR NAME="count"> ports:</p>
 
-<TMPL_INCLUDE NAME="result-list.tmpl">
+<TMPL_INCLUDE NAME="port-list.tmpl">
 
 </div>
 
--- Tools/magus/www/tmpls/result-list.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<table class="result-list">
-	<tr>
-		<th>Port</th>
-		<th>Version</th>
-		<th>Status</th>
-		<th>Run</th>
-		<th>OSVersion</th>
-		<th>Arch</th>
-		<th></th>
-	</tr>
-	<TMPL_LOOP NAME=results>
-	<tr class="<TMPL_VAR NAME=summary><TMPL_UNLESS NAME=__odd__> even</TMPL_UNLESS>">
-		<td><a href="<TMPL_VAR name=port_root>/<TMPL_VAR NAME=id>"><TMPL_VAR NAME="port"></a></td>
-		<td><TMPL_VAR NAME=version></td>
-		<td><TMPL_VAR NAME=summary></td>
-		<td><a href="<TMPL_VAR NAME="run_root">/<TMPL_VAR NAME="run">"><TMPL_VAR NAME=run></a></td>
-		<td><TMPL_VAR NAME=osversion></td>
-		<td><TMPL_VAR NAME=arch></td>
-		<td>
-	            (<a href="<TMPL_VAR NAME="port_root">/<TMPL_VAR NAME="id">">Show Details</a>) ·
-	            (<a onclick="return confirm_reset()" href="/magus/auth/reset_port.cgi?id=<TMPL_VAR NAME=id>">Reset Port</a>)
-        	</td>
-        </tr>
-        <tr class="details<TMPL_UNLESS NAME=__odd__> even</TMPL_UNLESS>" id="result_<TMPL_VAR NAME=id>_row">
-        	<td colspan="6" id="result_<TMPL_VAR NAME=id>_details"></td>
-        </tr>
-                
-	</TMPL_LOOP>
-</table>
-
Index: port.tmpl
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/tmpls/port.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -L Tools/magus/www/tmpls/port.tmpl -L Tools/magus/www/tmpls/port.tmpl -u -r1.6 -r1.7
--- Tools/magus/www/tmpls/port.tmpl
+++ Tools/magus/www/tmpls/port.tmpl
@@ -51,10 +51,9 @@
 	<td><TMPL_VAR NAME="arch"></td>
 	<td><TMPL_VAR NAME="status"></td>
 	<td>
-	    <TMPL_IF NAME="has_details">
-		(<a href="#" id="result_<TMPL_VAR NAME=id>_link" onclick="return details_link(<TMPL_VAR NAME=id>);">Show Details</a>)
-	    </TMPL_IF>
+	  <TMPL_IF NAME="can_reset">
 	    (<a onclick="return confirm_reset()" href="/magus/auth/reset_port.cgi?id=<TMPL_VAR NAME=id>">Reset Port</a>)
+	  </TMPL_IF>
 	</td> 
 </tr>
 </table>