roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1619148 - in /roller/trunk/app/src/main/webapp: WEB-INF/jsps/editor/ThemeEdit.jsp roller-ui/styles/roller.css themes/gaurav/images/theme-gaurav.png themes/gaurav/images/theme-responsive.png themes/gaurav/theme.xml
Date Wed, 20 Aug 2014 16:37:45 GMT
Author: gmazza
Date: Wed Aug 20 16:37:45 2014
New Revision: 1619148

URL: http://svn.apache.org/r1619148
Log:
Shrunk gaurav preview image down to size of other theme images, added theme description for
when choosing a custom template.

Added:
    roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-gaurav.png   (with props)
Removed:
    roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-responsive.png
Modified:
    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/app/src/main/webapp/themes/gaurav/theme.xml

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=1619148&r1=1619147&r2=1619148&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 Wed Aug 20 16:37:45
2014
@@ -19,10 +19,10 @@
 <script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
 
 <script>
-function previewImage(q, theme) {
+function previewImage(q, q_desc, theme) {
     q.attr('src','<s:property value="siteURL" />/roller-ui/authoring/previewtheme?theme='
+ theme);
     var url = "<%= request.getContextPath() %>/roller-ui/authoring/themedata/";
-	$.ajax({ url: url, data: {theme:theme}, success: function(data) { $('#themedescription').html(data);}
});
+	$.ajax({ url: url, data: {theme:theme}, success: function(data) { q_desc.html(data);} });
 }
 function fullPreview(selector) {
     selected = selector.selectedIndex;
@@ -106,18 +106,18 @@ function toggleImportThemeDisplay() {
         <p>
             <s:select id="sharedSelector" name="themeId" list="themes"
                       listKey="id" listValue="name" size="1"
-                      onchange="previewImage($('#sharedPreviewImg'), this[selectedIndex].value)"/>
+                      onchange="previewImage($('#sharedPreviewImg'), $('#sThemeDescription'),
this[selectedIndex].value)"/>
         </p>
-        <p id="themedescription"></p>
+        <p id="sThemeDescription"></p>
         <p>
             <img id="sharedPreviewImg" src="" />
             <!-- initialize preview image at page load -->
             <script>
                 <s:if test="customTheme">
-                    previewImage($('#sharedPreviewImg'), '<s:property value="themes[0].id"/>');
+                    previewImage($('#sharedPreviewImg'), $('#sThemeDescription'), '<s:property
value="themes[0].id"/>');
                 </s:if>
                 <s:else>
-                    previewImage($('#sharedPreviewImg'), '<s:property value="themeId"/>');
+                    previewImage($('#sharedPreviewImg'), $('#sThemeDescription'), '<s:property
value="themeId"/>');
                 </s:else>
             </script>
         </p>
@@ -172,17 +172,18 @@ function toggleImportThemeDisplay() {
             <p>
                 <s:select id="customSelector" name="importThemeId" list="themes"
                           listKey="id" listValue="name" size="1"
-                          onchange="previewImage($('#customPreviewImg'), this[selectedIndex].value)"/>
+                          onchange="previewImage($('#customPreviewImg'), $('#cThemeDescription'),
this[selectedIndex].value)"/>
             </p>
+            <p id="cThemeDescription"></p>
             <p>
                 <img id="customPreviewImg" src="" />
                 <!-- initialize preview image at page load -->
                 <script>
                 <s:if test="customTheme">
-                    previewImage($('#customPreviewImg'), '<s:property value="themes[0].id"/>');
+                    previewImage($('#customPreviewImg'), $('#cThemeDescription'), '<s:property
value="themes[0].id"/>');
                 </s:if>
                 <s:else>
-                    previewImage($('#customPreviewImg'), '<s:property value="themeId"/>');
+                    previewImage($('#customPreviewImg'), $('#cThemeDescription'), '<s:property
value="themeId"/>');
                 </s:else>
                 </script>
             </p>

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=1619148&r1=1619147&r2=1619148&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 Wed Aug 20 16:37:45 2014
@@ -788,12 +788,6 @@ div.autocomplete ul li {
     margin: 0px 30px 30px 30px;
 }
 
-#themeImport {
-    width: 85%;
-    margin-left: auto;
-    margin-right: auto;
-}
-
 /* ---------------------------------------------------------------------- */
 /* Media File styles */
 

Added: roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-gaurav.png
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-gaurav.png?rev=1619148&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-gaurav.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml?rev=1619148&r1=1619147&r2=1619148&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml Wed Aug 20 16:37:45 2014
@@ -9,7 +9,7 @@
     <author>Gaurav Saini</author>
 
     <!-- theme preview image -->
-    <preview-image path="images/theme-responsive.png" />
+    <preview-image path="images/theme-gaurav.png" />
 
     <!-- stylesheet -->
     <stylesheet>



Mime
View raw message