roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghu...@apache.org
Subject svn commit: r1240211 - in /roller/trunk: weblogger-business/src/main/java/org/apache/roller/weblogger/business/ weblogger-webapp/src/main/webapp/WEB-INF/jsps/ weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ weblogger-webapp/src/main/webapp/WEB-IN...
Date Fri, 03 Feb 2012 15:19:06 GMT
Author: ghuber
Date: Fri Feb  3 15:19:05 2012
New Revision: 1240211

URL: http://svn.apache.org/viewvc?rev=1240211&view=rev
Log:
Some testing...

Modified:
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/sidebar.vm
    roller/trunk/weblogger-webapp/src/main/webapp/themes/fauxcoly/entry.vm
    roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/sotto-custom.css

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java
(original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java
Fri Feb  3 15:19:05 2012
@@ -384,7 +384,7 @@ public class MultiWeblogURLStrategy exte
         
         // is this for a specific weblog or site-wide?
         if (weblog != null) {
-            url.append("/weblog/");
+            url.append("weblog/");
             url.append(weblog.getHandle());
             url.append("/");
         }

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp Fri Feb
 3 15:19:05 2012
@@ -27,10 +27,13 @@
 <script type="text/javascript" src="<s:url value='/roller-ui/yui/dragdrop/dragdrop-min.js'
/>"></script>
 
 <script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.4.2.min.js"
/>"></script>
-
+<!-- Combo-handled YUI JS files: TODO add to roller-ui/yui or remove??
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/combo?2.8.0r4/build/autocomplete/assets/skins/sam/autocomplete.css">

+<script type="text/javascript" src="http://yui.yahooapis.com/combo?2.8.0r4/build/animation/animation-min.js&2.8.0r4/build/connection/connection-min.js&2.8.0r4/build/datasource/datasource-min.js&2.8.0r4/build/autocomplete/autocomplete-min.js"></script>
+-->
 <style>
 #tagAutoCompleteWrapper {
-    width:25em; /* set width here or else widget will expand to fit its container */
+    width:40em; /* set width here or else widget will expand to fit its container */
     padding-bottom:2em;
 }
 </style>
@@ -210,15 +213,11 @@
 </s:form>
 
 <script type="text/javascript">
-
 YAHOO.example.RemoteCustomRequest = function() {
-    //var oDS = new YAHOO.util.LocalDataSource(tags);
-    //oDS.responseSchema = {fields:["tag"]};
-
     // Use an XHRDataSource
     var oDS = new YAHOO.util.XHRDataSource('<s:property value="jsonAutocompleteUrl" />');
     // Set the responseType
-    oDS.responseType = YAHOO.util.DataSourceBase.TYPE_JSON;
+    oDS.responseType = YAHOO.util.XHRDataSource.TYPE_JSON;
     // Define the schema of the JSON results
     oDS.responseSchema = {
         resultsList : "tagcounts",
@@ -241,4 +240,17 @@ YAHOO.example.RemoteCustomRequest = func
         oAC: oAC
     };
 }();
+//Get cookie to determine state of control
+if (getCookie('control-miscControl') != null) {
+    if(getCookie('control-miscControl') == 'true'){
+        toggle('miscControl');
+        togglePlusMinus('imiscControl');
+    }
+}
+if (getCookie('control-pluginControl') != null) {
+    if(getCookie('control-pluginControl') == 'true'){
+        toggle('pluginControl');
+        togglePlusMinus('ipluginControl');
+    }
+}
 </script>

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp Fri Feb
 3 15:19:05 2012
@@ -27,11 +27,13 @@
 <script type="text/javascript" src="<s:url value='/roller-ui/yui/dragdrop/dragdrop-min.js'
/>"></script>
 
 <script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.4.2.min.js"
/>"></script>
-
-
+<!-- Combo-handled YUI JS files: TODO add to roller-ui/yui or remove??
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/combo?2.8.0r4/build/autocomplete/assets/skins/sam/autocomplete.css">

+<script type="text/javascript" src="http://yui.yahooapis.com/combo?2.8.0r4/build/animation/animation-min.js&2.8.0r4/build/connection/connection-min.js&2.8.0r4/build/datasource/datasource-min.js&2.8.0r4/build/autocomplete/autocomplete-min.js"></script>
+-->
 <style>
 #tagAutoCompleteWrapper {
-    width:25em; /* set width here or else widget will expand to fit its container */
+    width:40em; /* set width here or else widget will expand to fit its container */
     padding-bottom:2em;
 }
 </style>
@@ -136,8 +138,10 @@ function fullPreviewMode() {
                 <label for="title"><s:text name="weblogEdit.tags" /></label>
             </td>
             <td>
-                <s:textfield id="tagAutoComplete" cssClass="entryEditTags" name="bean.tagsAsString"
size="70" maxlength="255" tabindex="3" />
-                <div id="tagAutoCompleteContainer"></div>
+                <div id="tagAutoCompleteWrapper">
+                    <s:textfield id="tagAutoComplete" cssClass="entryEditTags" name="bean.tagsAsString"
size="70" maxlength="255" tabindex="3" />
+                    <div id="tagAutoCompleteContainer"></div>
+                </div>
             </td>
         </tr> 
         
@@ -287,7 +291,6 @@ function fullPreviewMode() {
     
 </s:form>
 
-
 <script type="text/javascript">
 YAHOO.example.RemoteCustomRequest = function() {
     // Use an XHRDataSource
@@ -316,5 +319,17 @@ YAHOO.example.RemoteCustomRequest = func
         oAC: oAC
     };
 }();
+//Get cookie to determine state of control
+if (getCookie('control-miscControl') != null) {
+    if(getCookie('control-miscControl') == 'true'){
+        toggle('miscControl');
+        togglePlusMinus('imiscControl');
+    }
+}
+if (getCookie('control-pluginControl') != null) {
+    if(getCookie('control-pluginControl') == 'true'){
+        toggle('pluginControl');
+        togglePlusMinus('ipluginControl');
+    }
+}
 </script>
-    
\ No newline at end of file

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp Fri
Feb  3 15:19:05 2012
@@ -73,10 +73,10 @@
                 <td class="field">
                     <s:textfield name="bean.link" size="50" onkeyup="updatePageURLDisplay()"
/>
                     <br />
-                    <s:property value="actionWeblog.absoluteURL" />page/<span id="linkPreview"
style="color:red">
-                        <s:property value="bean.link" /></span>
-                    <s:if test="template.link != null">[<a id="launchLink" onClick="launchPage()">
-                        <s:text name="pageForm.launch" /></a>]</s:if>
+                    <s:property value="actionWeblog.absoluteURL" />page/<span id="linkPreview"
style="color:red"><s:property value="bean.link" /></span>
+                    <s:if test="template.link != null">
+                        [<a id="launchLink" onClick="launchPage()"><s:text name="pageForm.launch"
/></a>]
+                    </s:if>
                 </td>
                 <td class="description"></td>
             </tr>
@@ -287,6 +287,13 @@ function changeSize1(num) {
     expires.setTime(expires.getTime() + 24 * 90 * 60 * 60 * 1000); // sets it for approx
90 days.
     setCookie("templateEditorRows", standardElem.rows, expires);
 }
+//Get cookie to determine state of control
+if (getCookie('control-advancedControl') != null) {
+    if(getCookie('control-advancedControl') == 'true'){
+        toggle('advancedControl');
+        togglePlusMinus('iadvancedControl');
+    }
+}
 </script>
-        
+
  
\ No newline at end of file

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp Fri Feb
 3 15:19:05 2012
@@ -23,5 +23,4 @@
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.1" prefix="str" %>
 
-<link rel="stylesheet" type="text/css" 
-   href='<s:url value="/roller-ui/yui/tabview/assets/skins/sam/tabview.css"></s:url>'</link>
+<link rel="stylesheet" type="text/css" href='<s:url value="/roller-ui/yui/tabview/assets/skins/sam/tabview.css"></s:url>'/>

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp Fri
Feb  3 15:19:05 2012
@@ -21,6 +21,7 @@
     <head>
         <title><s:text name="error" /></title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon" />
         <tiles:insertAttribute name="head" />
     </head>
     <body class=" yui-skin-sam">

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
(original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-installpage.jsp
Fri Feb  3 15:19:05 2012
@@ -21,6 +21,7 @@
     <head>
         <title><s:property value="pageTitle" /></title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon" />
         <tiles:insertAttribute name="head" />
     </head>
     <body class=" yui-skin-sam">

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
(original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
Fri Feb  3 15:19:05 2012
@@ -21,6 +21,7 @@
     <head>
         <title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle" /></title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon" />
         
         <tiles:insertAttribute name="head" />     
         <style type="text/css">

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
(original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
Fri Feb  3 15:19:05 2012
@@ -21,6 +21,7 @@
     <head>
         <title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle" /></title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon" />
         
         <tiles:insertAttribute name="head" />
         <style type="text/css">

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
(original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
Fri Feb  3 15:19:05 2012
@@ -21,6 +21,7 @@
     <head>
         <title><s:property value="getProp('site.shortName')"/>: <s:property
value="pageTitle" /></title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <link rel="shortcut icon" href="<%= request.getContextPath() %>/favicon.ico"
type="image/x-icon" />
         
         <tiles:insertAttribute name="head" />     
         <style type="text/css">

Modified: roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/sidebar.vm
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/sidebar.vm?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/sidebar.vm (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/sidebar.vm Fri Feb 
3 15:19:05 2012
@@ -1,6 +1,6 @@
 
          <h1 id="banner">
-            $model.weblog.name
+            <a href="$url.home">$model.weblog.name</a>
             <span class="tagline"><em>$model.weblog.description</em></span>
          </h1>
 

Modified: roller/trunk/weblogger-webapp/src/main/webapp/themes/fauxcoly/entry.vm
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/fauxcoly/entry.vm?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/fauxcoly/entry.vm (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/fauxcoly/entry.vm Fri Feb  3 15:19:05
2012
@@ -177,8 +177,10 @@
     #showNextPrevEntriesControl($pager)
 </div>
 #showWeblogEntriesPager($pager)
-#showWeblogEntryComments($entry)
-#showWeblogEntryCommentForm($entry)
+#foreach( $entry in $entries )
+    #showWeblogEntryComments($entry)
+    #showWeblogEntryCommentForm($entry)
+#end
 </div>
 
 </div>
@@ -202,23 +204,23 @@
       <tr>
         <td><img src="$url.resource('icons/delicious.gif')"
                alt="del.icio.us" height="16" width="16" />
-            <a href="http://del.icio.us/post?url=$absBaseURL$entry.permaLink"
+            <a href="http://del.icio.us/post?url=$url.absoluteSite$model.weblogEntry.permaLink"
                title="bookmark it in del.icio.us">Bookmark it</a></td>
 
         <td><img src="$url.resource('icons/digman.gif')"
                 alt="submit to dig digg.com" height="14" width="16" />
-            <a href="http://www.digg.com/submit?url=$absBaseURL$entry.permaLink&amp;phase=2"
title="submit it to digg">
+            <a href="http://www.digg.com/submit?url=$url.absoluteSite$model.weblogEntry.permaLink&amp;phase=2"
title="submit it to digg">
                 Digg it</a></td>
       </tr>
       <tr>
         <td><img src="$url.resource('icons/slashdot-13x13.png')"
                 alt="slashdot" border="0" />
-            <a href="http://slashdot.org/bookmark.pl?url=$absBaseURL$entry.permaLink"
title="submit it to slashdot">
+            <a href="http://slashdot.org/bookmark.pl?url=$url.absoluteSite$model.weblogEntry.permaLink"
title="submit it to slashdot">
                 Slashdot it</a></td>
 
         <td><img src="$url.resource('icons/technorati-16x15.png')" title="See who
links to it"
                 border="0" alt="technorati" height="15" width="16" />
-            <a href='http://technorati.com/search/$utilities.encode("$absBaseURL$entry.permaLink")'>
+            <a href='http://technorati.com/search/$utils.encode("$url.absoluteSite$model.weblogEntry.permaLink")'>
                 See who links to it</a>
         </td>
       </tr>

Modified: roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/sotto-custom.css
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/sotto-custom.css?rev=1240211&r1=1240210&r2=1240211&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/sotto-custom.css (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/sotto-custom.css Fri Feb  3
15:19:05 2012
@@ -93,7 +93,7 @@ ul.rFeeds li {
 }
 th.hCalendarDayNameRow {
     text-align : center;
-    font-size : small;
+    /*font-size : small;*/
     font-weight : bold;
 }
 td.hCalendarDayCurrent {
@@ -890,7 +890,7 @@ img.smiley 
 }
 
 table.hCalendarTable {
-    font-size: 1em;
+    font-size: 12px;
 }
 
 .thead, .hCalendarDayNameRow



Mime
View raw message