You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/08/25 19:38:42 UTC
svn commit: r1620386 - in /roller/trunk: app/pom.xml
app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
app/src/main/webapp/roller-ui/styles/roller.css assembly-release/pom.xml
it-selenium/pom.xml pom.xml
Author: gmazza
Date: Mon Aug 25 17:38:42 2014
New Revision: 1620386
URL: http://svn.apache.org/r1620386
Log:
Update to 5.1.1-SNAPSHOT, simplifications to roller.css and ThemeEdit.jsp
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css
roller/trunk/assembly-release/pom.xml
roller/trunk/it-selenium/pom.xml
roller/trunk/pom.xml
Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1620386&r1=1620385&r2=1620386&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Mon Aug 25 17:38:42 2014
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0</version>
+ <version>5.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=1620386&r1=1620385&r2=1620386&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp Mon Aug 25 17:38:42 2014
@@ -30,26 +30,17 @@ function fullPreview(selector) {
}
function updateThemeChooser(selected) {
if (selected[0].value == 'shared') {
- $('#sharedChooser').css('background','#CCFFCC');
- $('#sharedChooser').css('border','1px solid #008000');
+ $('#sharedChooser').addClass("selectedChooser");
+ $('#customChooser').removeClass("selectedChooser");
$('#sharedOptioner').show();
-
- $('#customChooser').css('background','#eee');
- $('#customChooser').css('border','1px solid #gray');
$('#customOptioner').hide();
} else {
- $('#customChooser').css('background','#CCFFCC');
- $('#customChooser').css('border','1px solid #008000');
+ $('#customChooser').addClass("selectedChooser");
+ $('#sharedChooser').removeClass("selectedChooser");
$('#customOptioner').show();
-
- $('#sharedChooser').css('background','#eee');
- $('#sharedChooser').css('border','1px solid #gray');
$('#sharedOptioner').hide();
}
}
-function toggleImportThemeDisplay() {
- $('themeImport').toggle();
-}
</script>
<p class="subtitle">
@@ -65,18 +56,18 @@ function toggleImportThemeDisplay() {
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td width="50%" valign="top">
- <div id="sharedChooser" class="chooser" style="height: 8em">
+ <div id="sharedChooser" class="chooser">
<h2><input id="sharedRadio" type="radio" name="themeType" value="shared"
- <s:if test="!customTheme">checked="true"</s:if>
+ <s:if test="!customTheme">checked</s:if>
onclick="updateThemeChooser($(this))" />
<s:text name="themeEditor.sharedTheme" /></h2>
<s:text name="themeEditor.sharedThemeDescription" />
</div>
</td>
<td width="50%" valign="top">
- <div id="customChooser" class="chooser" style="height: 8em">
+ <div id="customChooser" class="chooser">
<h2><input id="customRadio" type="radio" name="themeType" value="custom"
- <s:if test="customTheme">checked="true"</s:if>
+ <s:if test="customTheme">checked</s:if>
onclick="updateThemeChooser($(this))" />
<s:text name="themeEditor.customTheme" /></h2>
<s:text name="themeEditor.customThemeDescription" />
@@ -145,6 +136,7 @@ function toggleImportThemeDisplay() {
<span class="warning"><s:text name="themeEditor.importRequired" /></span>
</p>
</s:if>
+
<s:else>
<s:if test="customTheme">
<p>
@@ -210,12 +202,11 @@ function toggleImportThemeDisplay() {
<script>
<s:if test="customTheme">
updateThemeChooser($('#customRadio'));
+ <s:if test="firstCustomization">
+ $('#themeImport').show();
+ </s:if>
</s:if>
<s:else>
updateThemeChooser($('#sharedRadio'));
</s:else>
-
- <s:if test="firstCustomization">
- $('#themeImport').show();
- </s:if>
</script>
Modified: roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css?rev=1620386&r1=1620385&r2=1620386&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css (original)
+++ roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css Mon Aug 25 17:38:42 2014
@@ -19,7 +19,7 @@
/*
roller.css: Base CSS styles for Roller web UI
-CUSTOMIZABLE color and background image setttings have been separated out
+CUSTOMIZABLE color and background image settings have been separated out
and placed in separate colors.css files for different color schemes.
*/
@@ -749,35 +749,17 @@ pre {
margin-bottom: 5px;
}
-/* tag autocomplete */
-
-div.autocomplete {
- position:absolute;
- width:250px;
- background-color:white;
- border:1px solid #888;
- margin:0px;
- padding:0px;
-}
-div.autocomplete ul {
- list-style-type:none;
- margin:0px;
- padding:0px;
-}
-div.autocomplete ul li.selected { background-color: #ffb;}
-
-div.autocomplete ul li {
- list-style-type:none;
- display:block;
- margin:0;
- padding:2px;
- cursor:pointer;
-}
-
-
.chooser {
margin: 10px;
padding: 10px 20px 20px 20px;
+ background: #eee;
+ border: 1px solid #gray;
+ height: 8em;
+}
+
+div.selectedChooser {
+ background: #CCFFCC;
+ border: 1px solid #008000;
}
.chooser h2 {
@@ -788,43 +770,10 @@ div.autocomplete ul li {
margin: 0px 30px 30px 30px;
}
+
/* ---------------------------------------------------------------------- */
/* Media File styles */
-/*** for overlay ***/
-.yui-overlay span, #close {
- float: left;
-}
-
-#close { float: right; }
-
-#overlay {
- position: fixed;
- z-index:100;
- top: 0px;
- left: 0px;
- height:100%;
- width:100%;
- display: none;
- background-color:#000;
- filter:alpha(opacity=25);
- -moz-opacity: 0.25;
- opacity: 0.25;
-}
-
-.container-close {
- position:absolute;
- top:2px;
- right:4px;
- z-index:6;
- height:12px;
- width:12px;
- margin:0px;
- padding:0px;
- background:url('http://yui.yahooapis.com/2.6.0/build/container/assets/close12_1.gif') no-repeat;
- cursor:pointer
-}
-
.align-images {
display:inline;
float:left;
@@ -849,19 +798,6 @@ div.autocomplete ul li {
margin:15px 0px;
padding-left: 0.5em;
}
-#ewecontextmenu {
- background-color:#CECECE;
- border:1px solid #808080;
- line-height:1.5;
-}
-
-#ewecontextmenu li a {
- text-decoration:none;
- color: #000000;
-}
-
-#ewecontextmenu .yuimenuitem-selected{background-color:#36404C;}
-#ewecontextmenu .yuimenuitem-selected a {color:#ffffff;}
/*** Right control floats aka clearfix ***/
.clearfix:after {
Modified: roller/trunk/assembly-release/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/assembly-release/pom.xml?rev=1620386&r1=1620385&r2=1620386&view=diff
==============================================================================
--- roller/trunk/assembly-release/pom.xml (original)
+++ roller/trunk/assembly-release/pom.xml Mon Aug 25 17:38:42 2014
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0</version>
+ <version>5.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: roller/trunk/it-selenium/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/it-selenium/pom.xml?rev=1620386&r1=1620385&r2=1620386&view=diff
==============================================================================
--- roller/trunk/it-selenium/pom.xml (original)
+++ roller/trunk/it-selenium/pom.xml Mon Aug 25 17:38:42 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0</version>
+ <version>5.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1620386&r1=1620385&r2=1620386&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Mon Aug 25 17:38:42 2014
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.1.0</version>
+ <version>5.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>