jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject svn commit: r786992 - in /incubator/jspwiki/trunk: ./ src/WebContent/ src/WebContent/images/ src/WebContent/templates/default/ src/java/org/apache/wiki/
Date Sun, 21 Jun 2009 11:20:50 GMT
Author: brushed
Date: Sun Jun 21 11:20:49 2009
New Revision: 786992

URL: http://svn.apache.org/viewvc?rev=786992&view=rev
Log:
3.0.0-svn-131:        
        * Quick Navigation drop down menu position.
        * Overflow handling of wide pages. 
        * Location of the favicon.ico.
        * Insert 'jslocalizationstring' and 'jsfunction',
        * Formatting of the search detail fragments in FindContent.jsp.

Added:
    incubator/jspwiki/trunk/src/WebContent/favicon.ico   (with props)
Removed:
    incubator/jspwiki/trunk/src/WebContent/images/favicon.ico
    incubator/jspwiki/trunk/src/WebContent/images/favicon.png
Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/EditTemplate.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp
    incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=786992&r1=786991&r2=786992&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Jun 21 11:20:49 2009
@@ -1,3 +1,19 @@
+2009-06-21 Dirk Frederickx <brushed AT apache DOT org>
+
+        * 3.0.0-svn-131
+        
+        * Fixed Quick Navigation drop down menu position.
+        
+        * Fixed the overflow handling of wide pages. (eg pages with wide
+        preformatted content or wide images)
+
+        * Fixed the location of the favicon.ico.
+        
+        * Fixed the insertion of 'jslocalizationstring' and 'jsfunction',
+        which were missing from the DefaultLayout.jsp.
+        
+        * Fixed the formatting of the search detail fragments in FindContent.jsp.
+
 2009-06-14 Dirk Frederickx <brushed AT apache DOT org>
 
         * 3.0.0-svn-130

Added: incubator/jspwiki/trunk/src/WebContent/favicon.ico
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/favicon.ico?rev=786992&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/jspwiki/trunk/src/WebContent/favicon.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp?rev=786992&r1=786991&r2=786992&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp Sun Jun 21
11:20:49 2009
@@ -87,7 +87,7 @@
     <link rel="start" href="<wiki:LinkTo format='url' page='${wikiEngine.frontPage}'
/>" title="Front page" />
     <link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'
/>" />
     <%-- ie6 needs next line --%>
-    <link rel="icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'
/>" />
+    <link rel="icon" type="image/x-icon" href="<wiki:Link format='url' jsp='favicon.ico'
/>" />
     <%--
 
          Support for the universal edit button
@@ -123,8 +123,12 @@
     --%>
     <script type="text/javascript">//<![CDATA[
     /* Localized javascript strings: LocalizedStrings[] */
+    <%-- DELETEME
     <s:layout-component name="jslocalizedstrings" />
     <s:layout-component name="jsfunction" />
+    --%>
+    <wiki:IncludeResources type="jslocalizedstrings"/>
+    <wiki:IncludeResources type="jsfunction"/>
     //]]></script>
     <%--
 

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/EditTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/EditTemplate.jsp?rev=786992&r1=786991&r2=786992&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/EditTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/EditTemplate.jsp Sun Jun 21 11:20:49
2009
@@ -43,7 +43,10 @@
   <wiki:Include page="commonheader.jsp" />
 </head>
 
+<%--
 <body <wiki:CheckRequestContext context='edit'>class="edit"</wiki:CheckRequestContext>
<wiki:CheckRequestContext context='comment'>class="comment"</wiki:CheckRequestContext>
>
+--%>
+<body class="${requestContext}" >
 
 <div id="wikibody" class="${prefs.Orientation}">
 

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp?rev=786992&r1=786991&r2=786992&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp Sun Jun 21 11:20:49
2009
@@ -96,12 +96,12 @@
 
         %><tr class="odd">
             <td colspan="2">
-              <div class="fragment"><%
+              <div class="pre"><%
               
               for (int i = 0; i < contexts.length; i++) 
               {
               
-              %><%= (i > 0 ) ? "<span class='fragment_ellipsis'> ... </span>"
: ""  
+              %><%= (i > 0 ) ? "<span class='ellipsis'> ... </span>"
: ""  
               %><%= contexts[i]  %><%
               
               }

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp?rev=786992&r1=786991&r2=786992&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp Sun Jun 21 11:20:49
2009
@@ -28,7 +28,6 @@
         class="wikiform"
            id="searchForm" accept-charset="<wiki:ContentEncoding />">
 
-  <div style="position:relative">
   <input onblur="if( this.value == '' ) { this.value = this.defaultValue }; return true;
"
         onfocus="if( this.value == this.defaultValue ) { this.value = ''}; return true; "
            type="text" value="<fmt:message key='sbox.search.submit'/>"
@@ -39,7 +38,7 @@
   		 name="searchSubmit" id="searchSubmit"
   		value="<fmt:message key='find.submit.go'/>"
   		title="<fmt:message key='find.submit.go'/>"></button>
-  </div>
+
   <div id="searchboxMenu" style='visibility:hidden;'>
     <div id="searchTools">
       <a href="#" id='quickView' class='btn'

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css?rev=786992&r1=786991&r2=786992&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/jspwiki.css Sun Jun 21 11:20:49
2009
@@ -404,13 +404,17 @@
 code, tt, .pre, pre {
 	font:110% Monaco, "Courier New", Courier, monospace;
 	line-height:1.1;
-	border:1px solid #ddd/*#BORDER#*/;
+}
+.pre, pre {
+	white-space:pre;
+	_margin:1em auto;  /*FIXME: otherwise funny effect on more menu ugh */
 }
 pre {
 	clear:both;
 	margin:1em 1.5em;
 	padding:0.5em;
 	background:#f9f9f9/*#COMMENT#*/;
+	border:1px solid #ddd/*#BORDER#*/;
 	/*
 	border:1px dashed #0000aa; 
 	color:#000077; 
@@ -418,15 +422,10 @@
 	margin:1em 0;
 	*/
 }
-.pre, pre {
-	white-space:pre;
-	_margin:1em auto;  /*FIXME: otherwise funny effect on more menu ugh */
-}
-
-#previewcontent, #info, #pagecontent, #attach, #findcontent,.fragment,
+#previewcontent, #info, #pagecontent, #attach, #findcontent,
 .pre, pre, 
 .xflow {
-	overflow:auto;
+	overflow-y:hidden; /*safari only ??*/
 	_width:100%;
     /*ie hacks CHECKME*/
 	_xxoverflow:visible; 
@@ -434,7 +433,6 @@
 	_xxzoom:1; /*width:95%;  hasLayout=true */
 	_padding-bottom:1.5em; /*take scrollbar into account on ie ugh*/
 }
-
                            
 /*
 Links:
@@ -713,6 +711,7 @@
 a.infolink img {
 	display:none;
 }
+/*
 a.infolink[href$='.doc'] {
 	background:transparent url(images/attach-strip.png) no-repeat center right;
 	background-position:0 -32px;
@@ -721,6 +720,7 @@
 	background:transparent url(images/attach-strip.png) no-repeat center right;
 	background-position:0 -80px;
 }
+*/
 
 
 
@@ -1019,16 +1019,16 @@
 
 #page {
 	position:relative;
-	padding:0 0 0 10px;
+	padding:0 0 0 16px;
 }
 .fav-right #page {
-	padding:0 10px 0 0;
+	padding:0 16px 0 0;
 }
 #page .splitbar {
 	position:absolute;
 	width:4px;
 	top:1.75em; /* 1.5line-height + ?0.25 */
-	left:6px;
+	left:12px;
 	bottom:2em; /* 1.5line-height + 0.5margin-bottom */
 	background:#f9f9f9/*#COMMENT#*/;
 	xxborder-top:1px solid #f9f9f9/*#COMMENT#*/;
@@ -1036,7 +1036,7 @@
 }
 .fav-right #page .splitbar {
 	left:auto;
-	right:6px;
+	right:12px;
 }
 #page .splitbar.hover {
 	background:#eee;
@@ -1075,17 +1075,14 @@
 	border-left-style:solid;
 	border-bottom-style:solid;
 }
-.fragment {
-	padding:0.25em;
-	font:90% Monaco, "Courier New", Courier, monospace;
-	width:800px;
-	white-space:pre;/* check */
+/* search detail fragment */
+#searchResult2 .pre {
+	padding:0.5em;
 }
 /* search detail fragment pieces are concatenated by an ... ellips char. */
-.fragment_ellipsis {
+.ellipsis {
 	font-weight:bold;
 }
-*/
 .nosearchresult {
 	font-style:italic;
 }

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=786992&r1=786991&r2=786992&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Jun 21 11:20:49 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "130";
+    public static final String     BUILD         = "131";
 
     /**
      *  This is the generic version string you should use



Mime
View raw message