Merge pull request #480 from spyhunter99/feature/JSPWIKI-1265

JSPWIKI-1265 additional skins for the haddock template

Author: spyhunter99

jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java

@@ -105,7 +105,7 @@ public static void reloadPreferences( final PageContext pageContext ) {
         prefs.put("Layout", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.layout", "fluid" ) );
         prefs.put("Language", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.language", getLocale( ctx ).toString() ) );
         prefs.put("SectionEditing", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.sectionediting", "true" ) );
-        prefs.put("Appearance", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.appearance", "true" ) );
+        //prefs.put("Appearance", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.appearance", "true" ) );
 
         //editor cookies
         prefs.put("autosuggest", TextUtil.getStringProperty( props, "jspwiki.defaultprefs.template.autosuggest", "true" ) );

jspwiki-main/src/main/resources/ini/jspwiki.properties

@@ -1014,7 +1014,7 @@ jspwiki.use.external.logconfig = true
 #
 # Set the name of the skin.
 # Default value is PlainVanilla
-jspwiki.defaultprefs.template.skinname =PlainVanilla
+jspwiki.defaultprefs.template.skinname=default
 
 # Set the format of dates
 jspwiki.defaultprefs.template.dateformat =dd-MMM-yyyy HH:mm

jspwiki-war/pom.xml

@@ -243,9 +243,12 @@
                         <resource>
                             <directory>${project.build.directory}/generated-sources/wro</directory>
                         </resource>
+                        <!--this direcotry use to host the dark mode css file, which was moved to
+                        the skins dir on templates/default/dark
                         <resource>
                             <directory>src/main/styles/static</directory>
                         </resource>
+                            -->
                     </webResources>
                 </configuration>
             </plugin>

jspwiki-war/src/main/scripts/wiki/Prefs.js

@@ -87,7 +87,7 @@ Javascript routines to support JSPWiki UserPreferences
         });
 
         //FFS: add click-triggers to some preferences:  prefLayout, prefOrientation,
-        form.prefAppearance.onchange = function(event){
+        form.prefSkin.onchange = function(event){
             console.log( this, getValue(this) );
 
         }

jspwiki-war/src/main/webapp/templates/default/PreferencesTab.jsp

@@ -132,16 +132,6 @@
     </label>
   </div>
 
-  <div class="form-group form-inline ">
-    <label class="control-label form-col-20" for="prefAppearance"><fmt:message key="prefs.user.appearance"/></label>
-    <label class="form-control form-switch xpref-appearance">
-      <!--<fmt:message key="prefs.user.appearance.light"/>-->
-      <input id="prefAppearance" name="prefAppearance"  data-pref="Appearance"
-           type="checkbox" class="" value="on" ${prefs.Appearance ? 'checked="checked"' : ''} >
-      <fmt:message key="prefs.user.appearance.dark"/>
-    </label>
-  </div>
-
   <c:if test='${not empty skins}'>
   <div class="form-group">
     <label class="control-label form-col-20" for="prefSkin"><fmt:message key="prefs.user.skin"/></label>

jspwiki-war/src/main/webapp/templates/default/commonheader.jsp

@@ -74,10 +74,6 @@ String.I18N.PREFIX = "javascript.";
 <link rel="stylesheet" type="text/css" media="screen, projection, print" id="main-stylesheet"
      href="<wiki:Link format='url' templatefile='haddock.css'/>" />
 
-<c:if test="${prefs.Appearance }">
-<link rel="stylesheet" type="text/css" media="screen, projection, print" id="main-stylesheet"
-     href="<wiki:Link format='url' templatefile='haddock-dark.css'/>"/>
-</c:if>
 
 <wiki:IncludeResources type="stylesheet"/>
 <wiki:IncludeResources type="inlinecss" />