roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r395013 - in /incubator/roller/trunk/web: editor/richtext.js editor/rte.css theme/sun/colors.css theme/tan/colors.css weblog/WeblogEdit.jsp
Date Tue, 18 Apr 2006 19:43:32 GMT
Author: snoopdave
Date: Tue Apr 18 12:43:30 2006
New Revision: 395013

URL: http://svn.apache.org/viewcvs?rev=395013&view=rev
Log:
Switching back to old layout, adding theme correct colors

Modified:
    incubator/roller/trunk/web/editor/richtext.js
    incubator/roller/trunk/web/editor/rte.css
    incubator/roller/trunk/web/theme/sun/colors.css
    incubator/roller/trunk/web/theme/tan/colors.css
    incubator/roller/trunk/web/weblog/WeblogEdit.jsp

Modified: incubator/roller/trunk/web/editor/richtext.js
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/editor/richtext.js?rev=395013&r1=395012&r2=395013&view=diff
==============================================================================
--- incubator/roller/trunk/web/editor/richtext.js (original)
+++ incubator/roller/trunk/web/editor/richtext.js Tue Apr 18 12:43:30 2006
@@ -122,7 +122,7 @@
 
 // ROLLER_MOD: changed icon images
 
-			document.writeln('		<td><img id="bold" class="rteImage" src="' + imagesPath +
'bold.gif" width="16" height="16" alt="Bold" title="Bold" onClick="rteCommand(\'' + rte +
'\', \'bold\', \'\')"></td>');
+			document.writeln('		<td><img id="bold" class="rteImage" src="' + imagesPath +
'text_bold.png" width="16" height="16" alt="Bold" title="Bold" onClick="rteCommand(\'' + rte
+ '\', \'bold\', \'\')"></td>');
 			document.writeln('		<td><img class="rteImage"   src="' + imagesPath + 'text_italic.png"
width="16" height="16" alt="Italic" title="Italic" onClick="rteCommand(\'' + rte + '\', \'italic\',
\'\')"></td>');
 			document.writeln('		<td><img class="rteImage"   src="' + imagesPath + 'text_underline.png"
width="16" height="16" alt="Underline" title="Underline" onClick="rteCommand(\'' + rte + '\',
\'underline\', \'\')"></td>');
 			document.writeln('		<td><img class="rteVertSep" src="' + imagesPath + 'blackdot.gif"
width="1" height="20" border="0" alt=""></td>');

Modified: incubator/roller/trunk/web/editor/rte.css
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/editor/rte.css?rev=395013&r1=395012&r2=395013&view=diff
==============================================================================
--- incubator/roller/trunk/web/editor/rte.css (original)
+++ incubator/roller/trunk/web/editor/rte.css Tue Apr 18 12:43:30 2006
@@ -1,63 +1,50 @@
 .rteImage {
-	background: #FFFFFF; 
-	background: #F0F0F0;
-	border: 1px solid #D3D3D3; 
+	/* background: #F0F0F0; */
+	/* border: 1px solid #D3D3D3; */
     padding: 2px;
 	cursor: pointer;
 	cursor: hand;
 }
-
 .rteImageSm {
-	background: #FFFFFF; 
-	background: #F0F0F0;
-	border: 1px solid #D3D3D3; 
+	/* background: #F0F0F0; */
+	/* border: 1px solid #D3D3D3; */ 
     padding: 2px;
     margin: 2px 0px 0px 0px;
 	cursor: pointer;
 	cursor: hand;
 }
-
 .rteImageRaised, .rteImage:hover {
-	background: #FFFFFF; 
-    background: #F0F0F0; 
+    /* background: #F0F0F0; */
 	border: 1px outset;
 	cursor: pointer;
 	cursor: hand;
 }
-
 .rteImageLowered, .rteImage:active {
-	background: #FFFFFF; 
-	background: #F0F0F0; 
-	/*border: 1px inset;*/
+	/* background: #F0F0F0; */
+	/* border: 1px inset; */
 	cursor: pointer;
 	cursor: hand;
 }
-
 .rteVertSep {
 	margin: 0 4px 0 4px;
 }
-
 .rteBack {
-	background: #FFFFFF; 
-	background: #F0F0F0; 
-	/*border: 1px outset; */
+	/* background: #F0F0F0; */
+	/* border: 1px outset; */
 	letter-spacing: 0;
 	padding: 2px;
 }
-
 .rteBack tbody tr td, .rteBack tr td {
-	background: #FFFFFF; 
-	background: #F0F0F0; 
+	/* background: #F0F0F0; */
 	padding: 0;
 }
 
 .rteDiv {
 	display: block;
 	position: relative;
-	background: #F0F0F0;
-    border: 1px solid #F0F0F0;
+	/* background: #F0F0F0; */
+    /* border: 1px solid #F0F0F0; */
 }
-
 .rteFrame {
    border: 0px;
 }

Modified: incubator/roller/trunk/web/theme/sun/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/sun/colors.css?rev=395013&r1=395012&r2=395013&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/sun/colors.css (original)
+++ incubator/roller/trunk/web/theme/sun/colors.css Tue Apr 18 12:43:30 2006
@@ -154,4 +154,22 @@
 }
 td.mm_table_actions {
     background: #fff4d4;
-}
\ No newline at end of file
+}
+
+/* RTE editor  */
+
+.rteBack tbody tr td, .rteBack tr td, .rteDiv, .rteBack .rteImageLowered, .rteImage:active,
.rteImageRaised, .rteImage:hover, .rteImageSm, .rteImage {
+	background: #dee7ef;
+}
+.rteImage {
+	border: 1px solid #bcc5cd; 
+}
+.rteImageSm {
+	border: 1px solid #bcc5cd; 
+}
+.rteDiv {
+    border: 1px solid #bcc5cd;
+}
+
+
+

Modified: incubator/roller/trunk/web/theme/tan/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/tan/colors.css?rev=395013&r1=395012&r2=395013&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/tan/colors.css (original)
+++ incubator/roller/trunk/web/theme/tan/colors.css Tue Apr 18 12:43:30 2006
@@ -145,3 +145,22 @@
 td.mm_table_actions {
     background: #fff4d4;
 }
+
+/* RTE editor  */
+
+.rteBack tbody tr td, .rteBack tr td, .rteDiv, .rteBack .rteImageLowered, .rteImage:active,
.rteImageRaised, .rteImage:hover, .rteImageSm, .rteImage {
+	background: #f1ebdf;
+}
+.rteImage {
+	border: 1px solid #d0cabc; 
+}
+.rteImageSm {
+	border: 1px solid #d0cabc; 
+}
+.rteDiv {
+    border: 1px solid #d0cabc;
+}
+
+
+
+

Modified: incubator/roller/trunk/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEdit.jsp?rev=395013&r1=395012&r2=395013&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEdit.jsp Tue Apr 18 12:43:30 2006
@@ -86,12 +86,100 @@
     <html:hidden name="method" property="method" value="save"/>
     
     <%-- ================================================================== --%>
-    <%-- Title field --%>
+    <%-- Title, category, dates and other metadata --%>
 
-    <p class="toplabel"><fmt:message key="weblogEdit.title" /></p>   
-    <html:text property="title" style="width:100%" maxlength="255" tabindex="1" />
+    <table class="entryEditTable" cellpadding="0" cellspacing="0" width="100%">   
+
+       <tr><td class="entryEditFormLabel">
+          <label for="title">
+             <fmt:message key="weblogEdit.title" />
+          </label>
+       </td><td>
+           <html:text property="title" style="width:100%" maxlength="255" tabindex="1"
/>
+       </td></tr>
+       
+       <tr><td class="entryEditFormLabel">
+          <label for="status">
+             <fmt:message key="weblogEdit.status" />
+          </label>
+       </td><td>
+          <c:if test="${!empty weblogEntryFormEx.id}">
+             <c:if test="${weblogEntryFormEx.published}">
+                <span style="color:green; font-weight:bold">
+                   <fmt:message key="weblogEdit.published" />
+                   (<fmt:message key="weblogEdit.updateTime" />
+                   <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both"
+                      dateStyle="short" timeStyle="short" />)
+                </span>
+            </c:if>
+            <c:if test="${weblogEntryFormEx.draft}">
+                <span style="color:orange; font-weight:bold">
+                   <fmt:message key="weblogEdit.draft" />
+                   (<fmt:message key="weblogEdit.updateTime" />
+                   <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both"
+                      dateStyle="short" timeStyle="short" />)
+                </span>
+            </c:if>
+            <c:if test="${weblogEntryFormEx.pending}">
+                <span style="color:orange; font-weight:bold">
+                   <fmt:message key="weblogEdit.pending" />
+                   (<fmt:message key="weblogEdit.updateTime" />
+                   <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both"
+                      dateStyle="short" timeStyle="short" />)
+                </span>
+            </c:if>
+        </c:if>
+        <c:if test="${empty weblogEntryFormEx.id}">
+           <span style="color:red; font-weight:bold"><fmt:message key="weblogEdit.unsaved"
/></span>
+        </c:if>
+    </td></tr>
+        
+    <tr><td class="entryEditFormLabel">
+       <label for="categoryId"><fmt:message key="weblogEdit.category" /></label>
+    </td><td>
+       <html:select property="categoryId" size="1" tabindex="4">
+       <html:optionsCollection name="model" property="categories" value="id" label="path"
 />
+       </html:select>
+    </td></tr>
+        
+    <tr>
+        <td class="entryEditFormLabel">
+            <label for="link"><fmt:message key="weblogEdit.pubTime" /></label>
+        </td>
+        <td>
+        <div>
+           <html:select property="hours">
+               <html:options name="model" property="hoursList" />
+            </html:select>
+           :
+           <html:select property="minutes" >
+               <html:options name="model" property="minutesList" />
+           </html:select>
+           :
+           <html:select property="seconds">
+               <html:options name="model" property="secondsList" />
+           </html:select>
+           &nbsp;&nbsp;
+           <roller:Date property="dateString" dateFormat='<%= model.getShortDateFormat()
%>' />
+           <c:out value="${model.weblogEntry.website.timeZone}" />
+        </div>
+    </td></tr>
     
+    <c:if test="${!empty weblogEntryFormEx.id}">
+        <tr><td class="entryEditFormLabel">
+            <label for="categoryId">
+               <fmt:message key="weblogEdit.permaLink" />
+            </label>
+            </td><td>
+            <a href='<c:out value="${model.permaLink}" />'>
+               <c:out value="${model.permaLink}" />
+            </a>
+        </td></tr>
+    </c:if>
     
+   </table>
+    
+   
     <%-- ================================================================== --%>
     <%-- Weblog edit, preview, or spell check area --%>
     
@@ -222,99 +310,11 @@
     <%-- ================================================================== --%>
     <%-- Other settings --%>
 
-    <br />
     <h2><fmt:message key="weblogEdit.otherSettings" /></h2>
- 
-    <table class="entryEditTable" cellpadding="0" cellspacing="0" width="100%">   
-      
-       <tr><td class="entryEditFormLabel">
-          <label for="title">
-             <fmt:message key="weblogEdit.status" />
-          </label>
-       </td><td>
-          <c:if test="${!empty weblogEntryFormEx.id}">
-             <c:if test="${weblogEntryFormEx.published}">
-                <span style="color:green; font-weight:bold">
-                   <fmt:message key="weblogEdit.published" />
-                   (<fmt:message key="weblogEdit.updateTime" />
-                   <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both"
-                      dateStyle="short" timeStyle="short" />)
-                </span>
-            </c:if>
-            <c:if test="${weblogEntryFormEx.draft}">
-                <span style="color:orange; font-weight:bold">
-                   <fmt:message key="weblogEdit.draft" />
-                   (<fmt:message key="weblogEdit.updateTime" />
-                   <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both"
-                      dateStyle="short" timeStyle="short" />)
-                </span>
-            </c:if>
-            <c:if test="${weblogEntryFormEx.pending}">
-                <span style="color:orange; font-weight:bold">
-                   <fmt:message key="weblogEdit.pending" />
-                   (<fmt:message key="weblogEdit.updateTime" />
-                   <fmt:formatDate value="${weblogEntryFormEx.updateTime}" type="both"
-                      dateStyle="short" timeStyle="short" />)
-                </span>
-            </c:if>
-        </c:if>
-        <c:if test="${empty weblogEntryFormEx.id}">
-           <span style="color:red; font-weight:bold"><fmt:message key="weblogEdit.unsaved"
/></span>
-        </c:if>
-    </td></tr>
-        
-    <tr><td class="entryEditFormLabel">
-       <label for="categoryId"><fmt:message key="weblogEdit.category" /></label>
-    </td><td>
-       <html:select property="categoryId" size="1" tabindex="4">
-       <html:optionsCollection name="model" property="categories" value="id" label="path"
 />
-       </html:select>
-    </td></tr>
-        
-    <tr>
-        <td class="entryEditFormLabel">
-            <label for="link"><fmt:message key="weblogEdit.pubTime" /></label>
-        </td>
-        <td>
-        <div>
-           <html:select property="hours">
-               <html:options name="model" property="hoursList" />
-            </html:select>
-           :
-           <html:select property="minutes" >
-               <html:options name="model" property="minutesList" />
-           </html:select>
-           :
-           <html:select property="seconds">
-               <html:options name="model" property="secondsList" />
-           </html:select>
-           &nbsp;&nbsp;
-           <roller:Date property="dateString" dateFormat='<%= model.getShortDateFormat()
%>' />
-           <c:out value="${model.weblogEntry.website.timeZone}" />
-        </div>
-    </td></tr>
-    
-    <c:if test="${!empty weblogEntryFormEx.id}">
-        <tr><td class="entryEditFormLabel">
-            <label for="categoryId">
-               <fmt:message key="weblogEdit.permaLink" />
-            </label>
-            </td><td>
-            <a href='<c:out value="${model.permaLink}" />'>
-               <c:out value="${model.permaLink}" />
-            </a>
-        </td></tr>
-    </c:if>
-    
-   </table>
-  
-   
-    <%-- ================================================================== --%>
-    <%-- More other settings --%>
-    
-   <%-- comment settings --%>
+     
+  <%-- ================================================================== --%>
+  <%-- comment settings --%>
    
-  <br />
   <div id="commentControlToggle" class="controlToggle">
   <span id="icommentControl">+</span>
   <a class="controlToggle" onclick="javascript:toggleControl('commentControlToggle','commentControl')">



Mime
View raw message