[interchange-cvs] interchange - racke modified dist/lib/UI/pages/admin/regenerate.html

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Wed Oct 10 04:04:04 2001


User:      racke
Date:      2001-10-10 08:03:20 GMT
Modified:  dist/lib/UI/pages/admin Tag: LINUXIA regenerate.html
Log:
now up-to-date with the development branch

Revision  Changes    Path
No                   revision



No                   revision



1.5.4.1   +34 -7     interchange/dist/lib/UI/pages/admin/regenerate.html


rev 1.5.4.1, prev_rev 1.5
Index: regenerate.html
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/pages/admin/regenerate.html,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- regenerate.html	2000/10/05 12:12:49	1.5
+++ regenerate.html	2001/10/10 08:03:19	1.5.4.1
@@ -32,12 +32,24 @@
 </select>
 </td>
 <td bgcolor="__UI_C_INTBLOCK__" width="__UI_RIGHT_WIDTH__">
-<b>Entry page:</b><br>
+
+[tmp pages][/tmp]
 
-[set pages][/set]
 [calc]
-	# Find the list of pages not defined "NoCache"
-	$Values->{ui_initial_page} = $Config->{SpecialPage}{catalog};
+    if ($Config->{StaticAll}) {
+        # startpage makes sense only if "StaticAll" is set
+    	$Values->{ui_initial_page} = $Config->{StaticIndex} || $Config->{SpecialPage}{catalog};
+        %forced_pages = ();
+    } else {
+    	$Values->{ui_initial_page};
+        # setup hash with selected pages
+        %forced_pages = %{$Config->{StaticPage}};
+        if ($Config->{StaticFly}) {
+            $forced_pages{$Config->{Special}->{flypage}} = 1;
+        }
+    }
+
+    # Find the list of pages not defined "NoCache"
 	@pages = split /\s+/, $Tag->list_pages();
 	my $check = $Config->{NoCache};
 	for(@pages) {
@@ -47,22 +59,37 @@
 		} while ($test =~ s:(.*)/.*:$1:);
 	}
 	$Scratch->{pages} = join "\n", grep $_, @pages;
+
+    # Generated selection of forced pages
+    my ($opts, $selected);
+    for (@pages) {
+        if (defined $forced_pages{$_}) {
+            $selected = ' selected';
+        } else {
+            $selected = '';
+        }
+        $opts .= "<option$selected>$_\n";
+    }
+	$Scratch->{forced_pages} = $opts;
 	return;
 [/calc]
 
+[if config StaticAll]
+<b>Entry page:</b><br>
+
+
 <select name="ui_initial_page">
 [loop option=ui_initial_page list="[scratch pages]"]
 	<option>[loop-code]
 [/loop]
 </select><BR><BR>
+[/if]
 	<table>
 		<tr>
 			<td>
 			<b>Force build of:</b><br>
 			<select name="ui_force_build" multiple size=25>
-			[loop prefix=force option=ui_initial_page list="[scratch pages]"]
-				<option>[force-code]
-			[/loop]
+			[scratchd forced_pages]  
 			</select>
 			</td>
 			<td>