Item13268: add navigation variant to wiki app

foswiki · Feb 19, 2015 · 6a7a8ef · 6a7a8ef
1 parent a6f961c
commit 6a7a8ef
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/PatternSkin/data/System/PatternSkinTheme.txt b/PatternSkin/data/System/PatternSkinTheme.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1288962587" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1424364892" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
 ---+!! <nop>PatternSkin theme
 Default pattern skin theme.
@@ -12,20 +12,21 @@ Default pattern skin theme.
    * Local PATTERNSKIN_COLUMNS = %PUBURLPATH%/%COLUMNS_RELATIVE%
    * Local PATTERNSKIN_THEME_VARIANT_RELATIVE = %URLPARAM{"variant" default="%SYSTEMWEB%/PatternSkinTheme/variant_foswiki_noframe.css"}%
    * Local PATTERNSKIN_THEME_VARIANT = %PUBURLPATH%/%PATTERNSKIN_THEME_VARIANT_RELATIVE%
+   * Local PATTERNSKIN_NAVIGATION_TOPIC = %IF{"$'URLPARAM{variant}' ~ '*navigation*'" then="%URLPARAM{"navigation" default="System/PatternSkinNavigation"}%"}%
 
-   * Local DISPLAY_FOSWIKI_LAYOUT_URL = %CALC{"$SUBSTITUTE(%FOSWIKI_LAYOUT_URL%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
-   * Local DISPLAY_FOSWIKI_STYLE_URL = %CALC{"$SUBSTITUTE(%FOSWIKI_STYLE_URL%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
-   * Local DISPLAY_FOSWIKI_COLORS_URL = %CALC{"$SUBSTITUTE(%FOSWIKI_COLORS_URL%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
-   * Local DISPLAY_PATTERNSKIN_COLUMNS = %CALC{"$SUBSTITUTE(%PATTERNSKIN_COLUMNS%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
-   * Local DISPLAY_PATTERNSKIN_THEME_VARIANT = %CALC{"$SUBSTITUTE(%PATTERNSKIN_THEME_VARIANT%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
--->   
-   
+   * Local DISPLAY_FOSWIKI_LAYOUT_URL = %CALCULATE{"$SUBSTITUTE(%FOSWIKI_LAYOUT_URL%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
+   * Local DISPLAY_FOSWIKI_STYLE_URL = %CALCULATE{"$SUBSTITUTE(%FOSWIKI_STYLE_URL%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
+   * Local DISPLAY_FOSWIKI_COLORS_URL = %CALCULATE{"$SUBSTITUTE(%FOSWIKI_COLORS_URL%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
+   * Local DISPLAY_PATTERNSKIN_COLUMNS = %CALCULATE{"$SUBSTITUTE(%PATTERNSKIN_COLUMNS%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
+   * Local DISPLAY_PATTERNSKIN_THEME_VARIANT = %CALCULATE{"$SUBSTITUTE(%PATTERNSKIN_THEME_VARIANT%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
+   * Local DISPLAY_PATTERNSKIN_NAVIGATION_TOPIC = %CALCULATE{"$SUBSTITUTE(%PATTERNSKIN_NAVIGATION_TOPIC%, %PUBURLPATH%/%SYSTEMWEB%, $NOP(%<nop>PUBURLPATH%/%<nop>SYSTEMWEB%))"}%
+-->
 <form action="%SCRIPTURL{view}%/%BASEWEB%/%BASETOPIC%">
 <input type="hidden" name="viewtheme" value="1" />
 <input type="hidden" name="layout" value="%PUBURLPATH%/%SYSTEMWEB%/PatternSkinTheme/layout.css" />
 <input type="hidden" name="style" value="%PUBURLPATH%/%SYSTEMWEB%/PatternSkinTheme/style.css" />
 <input type="hidden" name="colors" value="%PUBURLPATH%/%SYSTEMWEB%/PatternSkinTheme/colors.css" />
-<input type="hidden" name="navigation" value="" />
+<input type="hidden" name="navigation" value="%SYSTEMWEB%/PatternSkinNavigation" />
 <div class="foswikiFormSteps">
 <div class="foswikiFormStep">
 ---+++ Choose column
@@ -47,6 +48,7 @@ Default pattern skin theme.
 <optgroup label='Variant CSS options:'>
 <option value="%SYSTEMWEB%/PatternSkinTheme/variant_foswiki_noframe.css">No frame (default)</option>
 <option value="%SYSTEMWEB%/PatternSkinTheme/variant_foswiki_frame.css">Frame</option>
+<option value="%SYSTEMWEB%/PatternSkinTheme/variant_foswiki_navigation.css">Navigation</option>
 </optgroup>
 </select>
 </div>
@@ -75,7 +77,7 @@ Theme variants:
    * Set PATTERNSKIN_COLUMNS = %DISPLAY_PATTERNSKIN_COLUMNS%
    * Set PATTERNSKIN_THEME_VARIANT = %DISPLAY_PATTERNSKIN_THEME_VARIANT%
 Navigation:
-   * Set PATTERNSKIN_NAVIGATION_TOPIC =
+   * Set PATTERNSKIN_NAVIGATION_TOPIC = %DISPLAY_PATTERNSKIN_NAVIGATION_TOPIC%
 </textarea><br />
 <input type="button" class="foswikiButton" value="Highlight text" onClick="javascript:this.form.copypaste.focus();this.form.copypaste.select();">
 </form>