You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2015/06/22 22:11:44 UTC
svn commit: r1686927 [10/11] - in /jspwiki/trunk: ./
jspwiki-war/src/main/config/wro/ jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/resources/templates/
jspwiki-war/src/main/scripts/behaviors/
jspwiki-war/src/main/scripts/dialog/ jspw...
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Search.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ page import="org.apache.log4j.*" %>
@@ -28,7 +28,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
-<%!
+<%!
Logger log = Logger.getLogger("JSPWikiSearch");
%>
@@ -43,7 +43,7 @@
Collection list = null;
String query = request.getParameter( "query");
String go = request.getParameter("go");
-
+
if( query != null )
{
log.info("Searching for string "+query);
@@ -60,31 +60,31 @@
{
wikiContext.getWikiSession().addMessage( e.getMessage() );
}
-
+
query = TextUtil.replaceEntities( query );
pageContext.setAttribute( "query",
query,
PageContext.REQUEST_SCOPE );
-
+
//
// Did the user click on "go"?
- //
+ //
if( go != null )
{
if( list != null && list.size() > 0 )
{
SearchResult sr = (SearchResult) list.iterator().next();
-
+
WikiPage wikiPage = sr.getPage();
-
+
String url = wikiContext.getViewURL( wikiPage.getName() );
-
+
response.sendRedirect( url );
-
+
return;
}
- }
+ }
}
// Set the content type and include the response content
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml Mon Jun 22 20:11:42 2015
@@ -15,7 +15,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
@@ -82,7 +82,7 @@
<listener>
<listener-class>org.apache.wiki.auth.SessionMonitor</listener-class>
</listener>
-
+
<!--
Now, let's define the XML-RPC interfaces. You probably don't have to
touch these.
@@ -91,7 +91,7 @@
-->
<servlet>
<servlet-name>XMLRPC</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandler</param-value>
@@ -109,7 +109,7 @@
<servlet>
<servlet-name>XMLRPC-UTF8</servlet-name>
- <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
+ <servlet-class>org.apache.wiki.xmlrpc.RPCServlet</servlet-class>
<init-param>
<param-name>handler</param-name>
<param-value>org.apache.wiki.xmlrpc.RPCHandlerUTF8</param-value>
@@ -131,13 +131,13 @@
<!-- Atom Publishing Protocol -->
<servlet>
<servlet-name>ATOM</servlet-name>
- <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
+ <servlet-class>org.apache.wiki.rpc.atom.AtomAPIServlet</servlet-class>
</servlet>
<!-- Maps short URLS to JSPs; also, detects webapp shutdown. -->
<servlet>
<servlet-name>WikiServlet</servlet-name>
- <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
+ <servlet-class>org.apache.wiki.WikiServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -195,7 +195,7 @@
<welcome-file-list>
<welcome-file>Wiki.jsp</welcome-file>
</welcome-file-list>
-
+
<!-- Error pages -->
<error-page>
<error-code>403</error-code>
@@ -244,37 +244,37 @@
<!--
CONTAINER-MANAGED AUTHENTICATION & AUTHORIZATION
-
+
Here we define the users which are allowed to access JSPWiki.
- These restrictions cause the web container to apply further
+ These restrictions cause the web container to apply further
contraints to the default security policy in jspwiki.policy,
and should be suitable for a corporate intranet or public wiki.
In particular, the restrictions below allow all users to
read documents, but only Authenticated users can comment
on or edit them (i.e., access the Edit.jsp page).
- Users with the role Admin are the only persons who can
- delete pages.
+ Users with the role Admin are the only persons who can
+ delete pages.
To implement this policy, the container enforces two web
resource constraints: one for the Administrator resources,
- and one for Authenticated users. Note that the "role-name"
- values are significant and should match the role names
- retrieved by your web container's security realm. The roles
- of "Admin" and "Authenticated" are assigned by the web
+ and one for Authenticated users. Note that the "role-name"
+ values are significant and should match the role names
+ retrieved by your web container's security realm. The roles
+ of "Admin" and "Authenticated" are assigned by the web
container at login time.
For example, if you are using Tomcat's built-in "memory realm",
- you should edit the $CATALINA_HOME/conf/tomcat-users.xml file
+ you should edit the $CATALINA_HOME/conf/tomcat-users.xml file
and add the desired actual user accounts. Each user must possess
one or both of the Admin or Authenticated roles. For other realm
types, consult your web container's documentation.
-
- Alternatively, you could also replace all references to
- "Authenticated" and "Admin" with role names that match those
+
+ Alternatively, you could also replace all references to
+ "Authenticated" and "Admin" with role names that match those
returned by your container's security realm. We don't care
either way, as long as they match.
-
+
Note that accessing protected resources will cause your
container to try to use SSL (default port for Tomcat is 8443)
to secure the web session. This, of course, assumes your
@@ -284,7 +284,7 @@
-->
<!-- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Administrative Area</web-resource-name>
@@ -297,7 +297,7 @@
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Authenticated area</web-resource-name>
@@ -353,7 +353,7 @@
</description>
<role-name>Admin</role-name>
</security-role>
-
+
REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH -->
-
+
</web-app>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/error/Forbidden.html
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/error/Forbidden.html?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/error/Forbidden.html (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/error/Forbidden.html Mon Jun 22 20:11:42 2015
@@ -14,16 +14,25 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
-->
<html>
+ <style>
+ body { margin: 3em auto; width:50%; }
+ h3 {
+ font-family: 'HelveticaNeue-UltraLight', 'Helvetica Neue UltraLight', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+ font-size: 3em;
+ font-weight:400;
+ letter-spacing:2px;
+ }
+ </style>
<body>
<h3>Forbidden</h3>
<p>
<strong>Sorry, but you are not allowed to do that.</strong>
</p>
- <p>
+ <p>
Usually we block access to
something because you do not have the correct privileges (<em>e.g.</em>,
read, edit, comment) for the page you are looking for. In this particular case,
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/AJAXSearch.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -35,7 +35,7 @@
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
-<%!
+<%!
public void jspInit()
{
wiki = WikiEngine.getInstance( getServletConfig() );
@@ -49,30 +49,30 @@
/* Create wiki context and check for authorization */
WikiContext wikiContext = wiki.createContext( request, WikiContext.FIND );
if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response )) return;
-
+
String query = request.getParameter( "query");
if( (query != null) && ( !query.trim().equals("") ) )
{
try
- {
+ {
Collection list = wiki.findPages( query, wikiContext );
// Filter down to only those that we actually have a permission to view
AuthorizationManager mgr = wiki.getAuthorizationManager();
-
+
ArrayList items = new ArrayList();
-
+
for( Iterator i = list.iterator(); i.hasNext(); )
{
SearchResult r = (SearchResult)i.next();
-
+
WikiPage p = r.getPage();
-
+
PagePermission pp = new PagePermission( p, PagePermission.VIEW_ACTION );
try
- {
+ {
if( mgr.checkPermission( wikiContext.getWikiSession(), pp ) )
{
items.add( r );
@@ -80,7 +80,7 @@
}
catch( Exception e ) { log.error( "Searching for page "+p, e ); }
}
-
+
pageContext.setAttribute( "searchresults", items, PageContext.REQUEST_SCOPE );
}
catch( Exception e )
@@ -106,21 +106,21 @@
<p>
<fmt:message key="find.externalsearch"/>
- <a class="external"
+ <a class="external"
href="http://www.google.com/search?q=<c:out value='${param.query}'/>"
title="Google Search '<c:out value='${param.query}'/>'"
target="_blank">Google</a><img class="outlink" src="images/out.png" alt="" />
- |
- <a class="external"
- href="http://en.wikipedia.org/wiki/Special:Search?search=<c:out value='${param.query}'/>"
+ |
+ <a class="external"
+ href="http://en.wikipedia.org/wiki/Special:Search?search=<c:out value='${param.query}'/>"
title="Wikipedia Search '<c:out value='${param.query}'/>'"
target="_blank">Wikipedia</a><img class="outlink" src="images/out.png" alt="" />
</p>
- <wiki:SetPagination start="${param.start}" total="<%=list.size()%>" pagesize="20" maxlinks="9"
+ <wiki:SetPagination start="${param.start}" total="<%=list.size()%>" pagesize="20" maxlinks="9"
fmtkey="info.pagination"
onclick="$('start').value=%s; SearchBox.runfullsearch();" />
-
+
<div class="graphBars">
<div class="zebra-table">
<table class="wikitable" >
@@ -139,14 +139,13 @@
<c:if test="${param.details == 'on'}">
<%
String[] contexts = searchref.getContexts();
- if( (contexts != null) && (contexts.length > 0) )
+ if( (contexts != null) && (contexts.length > 0) )
{
-%>
+%>
<tr class="odd" >
- <td colspan="2" >
- <div class="fragment">
+ <td class="fragment" colspan="2">
<%
- for (int i = 0; i < contexts.length; i++)
+ for (int i = 0; i < contexts.length; i++)
{
%>
<%= (i > 0 ) ? "<span class='fragment_ellipsis'> ... </span>" : "" %>
@@ -154,22 +153,21 @@
<%
}
%>
- </div>
</td>
</tr>
-<%
+<%
}
%>
</c:if><%-- details --%>
</wiki:SearchResultIterator>
+ </table>
+
<wiki:IfNoSearchResults>
- <tr>
- <td class="nosearchresult" colspan="2"><fmt:message key="find.noresults"/></td>
- </tr>
+ <p class="warning"><fmt:message key="find.noresults"/></p>
</wiki:IfNoSearchResults>
- </table>
+
</div>
</div>
${pagination}
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/FindContent.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -40,19 +40,19 @@
<h4><fmt:message key="find.input" /></h4>
<p>
<input type="text"
- name="query" id="query2"
- value="<c:out value='${query}'/>"
+ name="query" id="query2"
+ value="<c:out value='${query}'/>"
size="32" />
<input type="checkbox" name="details" id="details" <c:if test='${param.details == "on"}'>checked='checked'</c:if> />
<fmt:message key="find.details" />
- <select name="scope" id="scope" >
+ <select name="scope" id="scope" >
<option value="" <c:if test="${empty param.scope}">selected="selected"</c:if> ><fmt:message key='find.scope.all' /></option>
<option value="author:" <c:if test='${param.scope eq "author:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.authors' /></option>
<option value="name:" <c:if test='${param.scope eq "name:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.pagename' /></option>
<option value="contents:" <c:if test='${param.scope eq "contents:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.content' /></option>
- <option value="attachment:" <c:if test='${param.scope eq "attachment:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.attach' /></option>
+ <option value="attachment:" <c:if test='${param.scope eq "attachment:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.attach' /></option>
</select>
<input type="submit" name="ok" id="ok" value="<fmt:message key="find.submit.find"/>" />
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/admin/UserManagement.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ page import="java.util.*" %>
@@ -59,7 +59,7 @@ function addNew()
$('email').value = "";
$('lastmodified').innerHTML = "";
$('creationdate').innerHTML = "";
-
+
var idlist=$('userid');
var len = idlist.options.length;
idlist.options[len] = new Option('--New--','--New--');
@@ -79,9 +79,9 @@ function addNew()
</select>
</div>
<div id="useredit">
- <form action="<wiki:Link jsp='admin/Admin.jsp' format='url'><wiki:Param name='tab-admin' value='users'/></wiki:Link>"
+ <form action="<wiki:Link jsp='admin/Admin.jsp' format='url'><wiki:Param name='tab-admin' value='users'/></wiki:Link>"
class="wikiform"
- id="adminuserform"
+ id="adminuserform"
onsubmit="return Wiki.submitOnce(this);"
method="post" accept-charset="<wiki:ContentEncoding/>"
enctype="application/x-www-form-urlencoded" >
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.js?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.js Mon Jun 22 20:11:42 2015
@@ -23,14 +23,14 @@
* SkinQute javascript extensions
* needed to initialise RoundedCorner elements.
*/
-if ( RoundedCorners ) {
+if ( RoundedCorners ) {
var r = RoundedCorners;
// r.register( "header", ['yyyy', 'lime', 'lime' ] );
// r.register( "footer", ['yyyy', 'lime', 'lime' ] );
}
-
+
/**
- * Preload logo images.
+ * Preload logo images.
*/
function preloadImages() {
var imageList = [
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/Smart/skin.css Mon Jun 22 20:11:42 2015
@@ -20,11 +20,11 @@
*/
/* SMART skin
- * Additional .css on top of jspwiki.css
+ * Additional .css on top of jspwiki.css
* Dirk Frederickx, May 07
*/
-/* COLOR scheme
+/* COLOR scheme
#666 font-color
#eee code, comment, weblogentries, (light grey)
#d7d7d7 table header(darker grey)
@@ -69,7 +69,7 @@
}
#footer {
margin-top:1em;
- margin-bottom:2em;
+ margin-bottom:2em;
}
#favorites {
margin-top:0;
@@ -80,12 +80,12 @@
}
/* +++ 200 Generic stuff here +++ */
-* {
+* {
color:#666;
}
/* +++ 210 Page titles, headings, and paragraphs +++ */
-#header .pagename {
+#header .pagename {
color:white;
}
h2 {
@@ -97,7 +97,7 @@ h3 {
h4 {
font-size:1.0em;
}
-h2,h3,h4 {
+h2,h3,h4 {
color:#c00;
}
.editsection a:link, .editsection a:active, .editsection a:visited {
@@ -126,7 +126,7 @@ legend, label {
}
/* +++ 240 Pre-formatted text blocks and code +++ */
-pre {
+pre {
border:1px dashed #b6b6b6;
background-color:#fff7c0; /*light yellow */
}
@@ -141,13 +141,13 @@ a.createpage {
color:#666;
border-bottom:1px dashed #c00;
}
-a.createpage:hover {
+a.createpage:hover {
border-bottom:1px solid #c00;
}
a.wikipage:hover {
border-bottom:1px solid #999;
}
-.calendar a, .breadcrumbs a, .applicationlogo a {
+.calendar a, .breadcrumbs a, .applicationlogo a {
border-bottom:none !important;
}
@@ -163,7 +163,7 @@ a.wikipage:hover {
background-image:url(images/smart-logo.gif);
background-position:top left;
}
-.applicationlogo a:hover {
+.applicationlogo a:hover {
background-position:top left;
}
@@ -185,7 +185,7 @@ a.wikipage:hover {
color:#c00;
border:1px solid #ccc;
}
-.wikitable * td {
+.wikitable * td {
padding:4px;
border:1px solid #ccc;
}
@@ -203,14 +203,14 @@ a.wikipage:hover {
/* +++ 425 Edit/EditContent and CommentContent +++ */
/* +++ 430 Edit/EditContent +++ */
.textarea-resizer {
- background:#fad112;
+ background:#fad112;
}
#findSuggestionMenu {
color:#c30;
background-color:#fad112;
border:4px solid #fad112;
}
-#findSuggestionMenu .hover {
+#findSuggestionMenu .hover {
background-color:#fff7c0;
}
@@ -229,14 +229,14 @@ a.wikipage:hover {
background:url(images/user_green.png) 2px 2px no-repeat;
}
/* +++ 450 FindContent / 450 Graph Bars +++ */
-.breadcrumbs {
+.breadcrumbs {
padding:0;
- height:1.5em;
+ height:1.5em;
overflow:hidden;
}
.searchword, .cursor, .searchmatch {
background-color: #fad112;
-}
+}
.graphBar {
border-color:#fad112;
}
@@ -268,7 +268,7 @@ a.wikipage:hover {
font-weight:bold;
color:#666;
}
-#moremenu a:hover, a.action:hover,
+#moremenu a:hover, a.action:hover,
.userbox a.action:hover, a.action.quick2bottom:hover, a.action.quick2top:hover {
background-color:#fad112 !important;
color:#c00;
@@ -298,7 +298,7 @@ a.tool:hover, .btn:hover {
}
#sneakpreviewheader {
background-color:#fff7c0;
-}
+}
/* +++ 475 PreviewContent - "This is a preview" comment +++ */
/* +++ 480 PreferencesContent, LoginContent, GroupContent +++ */
@@ -306,19 +306,19 @@ a.tool:hover, .btn:hover {
#searchSubmit {
background: url(../../images/search.gif) no-repeat center;
}
-#header a:link, #header a:visited, #recentSearches {
+#header a:link, #header a:visited, #recentSearches {
color:#666;
}
-#recentSearches div {
+#recentSearches div {
color:#666;
text-decoration:none;
}
-#searchboxMenu {
+#searchboxMenu {
border:1px solid #b6b6b6;
top:3em;
/*right:0;*/
-}
-#searchTools a:hover, #searchboxMenu li:hover {
+}
+#searchTools a:hover, #searchboxMenu li:hover {
background:#fad112;
}
@@ -327,7 +327,7 @@ a.tool:hover, .btn:hover {
/* +++ 610 Image plugin +++ */
/* +++ 203 image plugin stuff +++ */
/* +++ 620 Index plugin +++ */
-.index .header {
+.index .header {
color:#c00;
background:#fad112;
font-weight:bold;
@@ -399,7 +399,7 @@ table.calendar td.weekdays {
/* +++ 900 "Special-effects" JavaScript styles +++ */
/* +++ 905 Search highlights +++ */
/* +++ 910 Tabbed Pages +++ */
-.tabs {
+.tabs {
border:1px solid #b6b6b6;
}
.tabmenu a {
@@ -408,29 +408,29 @@ table.calendar td.weekdays {
margin:0 0 -1px 4px;
color:#666;
}
-.tabmenu a:hover, .tabmenu a:hover u, .tabmenu a:hover .accesskey {
+.tabmenu a:hover, .tabmenu a:hover u, .tabmenu a:hover .accesskey {
color:#c00;
background:#fff7c0;
}
-.tabmenu a.activetab {
+.tabmenu a.activetab {
border-bottom:1px solid white;
}
-.tabmenu a.activetab, .tabmenu a.activetab u {
+.tabmenu a.activetab, .tabmenu a.activetab u {
color:#666;
}
/* +++ 910 Accordion +++ */
-.accordion .toggle {
+.accordion .toggle {
border: 2px solid #fff7c0;
background:#fff7c0;
font-size:11px;
}
-.accordion, .tabbedAccordion {
+.accordion, .tabbedAccordion {
border:1px solid #b6b6b6;
}
.accordion .toggle {
}
-.togglemenu .toggle {
+.togglemenu .toggle {
border:1px solid #b6b6b6;
margin-left:4px;
}
@@ -450,8 +450,8 @@ table.calendar td.weekdays {
background:#fad112;
}
/* +++ 920 Collapsible lists +++ */
-.collapseBullet, .collapseOpen, .collapseClose {
- color:#c00;
+.collapseBullet, .collapseOpen, .collapseClose {
+ color:#c00;
}
.collapseOpen:hover, .collapseClose:hover {
background:#fad112;
@@ -471,7 +471,7 @@ table.calendar td.weekdays {
.quicklinks { font-size:12px;
padding:0 2px;
}
-.quicklinks, .quicklinks a {
+.quicklinks, .quicklinks a {
background:#fad112;
color:#c00;
border:none;
@@ -484,12 +484,12 @@ table.calendar td.weekdays {
.categoryTitle, .categoryText {
background:#fad112;
}
-.categoryPopup .hover {
+.categoryPopup .hover {
background:#fff7c0;
}
-.categoryLink:link, .categoryLink:active, .categoryLink:hover, .categoryLink:visited {
+.categoryLink:link, .categoryLink:active, .categoryLink:hover, .categoryLink:visited {
border-bottom:2px solid #ffcc33 !important;
-}
+}
.categoryPopup a:link, .categoryPopup a:active,.categoryPopup a:visited {
color:inherit;
}
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/AttachmentTab.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -53,10 +53,10 @@
<ul class="list-group form-col-50">
<li class="list-group-item droppable">
- <label>Select files <%--or drop them here!--%></label>
+ <label>Select files <span class='canDragAndDrop'>or drop them here!</span></label>
<input type="file" name="files" id="files" size="60"/>
<a class="hidden delete btn btn-danger btn-xs pull-right">Delete</a>
- </li>
+ </li>
</ul>
</div>
<div class="form-group">
@@ -66,11 +66,11 @@
<div class="form-group">
<input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
<input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
- <input class="btn btn-primary form-col-offset-20 form-col-50"
+ <input class="btn btn-primary form-col-offset-20 form-col-50"
type="submit" name="upload" id="upload" disabled="disabled" value="<fmt:message key='attach.add.submit'/>" />
<input type="hidden" name="action" value="upload" />
</div>
- <div class="hidden form-col-offset-20 form-col-80 progress progress-striped active">
+ <div class="hidden form-col-offset-20 form-col-50 progress progress-striped active">
<div class="progress-bar" data-progressid="<%=progressId%>" style="width: 100%;"></div>
</div>
@@ -91,9 +91,9 @@
class="hidden"
id="deleteForm"
method="post" accept-charset="<wiki:ContentEncoding />"
- onsubmit="return(confirm('<fmt:message key="attach.deleteconfirm"/>') );" >
+ data-modal="<fmt:message key='attach.deleteconfirm'/>" >
- <%--TODO: "nextpage" is not yet implemented in Delete.jsp
+ <%--TODO: "nextpage" is not yet implemented in Delete.jsp
<input type="hidden" name="nextpage" value="<wiki:Link context='upload' format='url'/>" />
--%>
<input class="btn btn-danger btn-xs" id="delete-all" name="delete-all" type="submit" value="Delete" />
@@ -139,9 +139,9 @@
<wiki:Permission permission="delete">
<td>
<input type="button"
- class="btn btn-danger btn-xs"
+ class="btn btn-danger btn-xs"
value="<fmt:message key='attach.delete'/>"
- src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />"
+ src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' ><wiki:Param name='tab' value='attach' /></wiki:Link>"
onclick="$('deleteForm').set('action',this.src); $('delete-all').click();" />
</td>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/CommentContent.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -24,14 +24,5 @@
<fmt:setBundle basename="templates.default"/>
<div class="page-content">
-<%--
- <wiki:Tab id="pagecontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext,"comment.tab.discussionpage")%>'>
- <wiki:InsertPage/>
- </wiki:Tab>
-
- <wiki:Tab id="commentcontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext,"comment.tab.addcomment")%>'>
---%>
-
<wiki:Editor />
-
</div>
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditGroupContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditGroupContent.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditGroupContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditGroupContent.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -86,10 +86,10 @@
</div>
<div class="form-group">
<label><fmt:message key="group.members"/></label>
-
+
<textarea id="members" name="members" rows="10" cols="30"><%=TextUtil.replaceEntities(s.toString())%></textarea>
<div class="help-block"><fmt:message key="editgroup.memberlist"/></div>
-
+
</div>
@@ -101,7 +101,7 @@
<wiki:Permission permission="viewGroup">
<a class="btn btn-default" href="<wiki:Link format="url" jsp='Group.jsp'><wiki:Param name='group' value='<%=name%>'/></wiki:Link>" >
<%=LocaleSupport.getLocalizedMessage(pageContext, "actions.viewgroup")%>
- </a>
+ </a>
</wiki:Permission>
<div class="help-block">
@@ -110,11 +110,10 @@
</form>
- <wiki:Permission permission="deleteGroup">
+ <wiki:Permission permission="deleteGroup">
<form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
- class=""
- id="deleteGroup"
- onsubmit="return( confirm('<fmt:message key="grp.deletegroup.confirm"/>') && Wiki.submitOnce(this) );"
+ class="" id="deleteGroup"
+ data-modal="'<fmt:message key='grp.deletegroup.confirm'/>"
method="POST" accept-charset="UTF-8">
<input class="btn btn-danger" type="submit" name="ok" value="<fmt:message key="actions.deletegroup"/>" />
<input type="hidden" name="group" value="${param.group}" />
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/EditTemplate.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -46,7 +46,7 @@
<body class="<wiki:Variable var='requestcontext' />" >
<div class="container${prefs.Layout=='fluid' ? '-fluid' : ''} ${prefs.Orientation}">
-
+
<wiki:Include page="Header.jsp" />
<wiki:Include page="Nav.jsp" />
<div class="content" data-toggle="li#menu,.sidebar>.close" >
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/FindContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/FindContent.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/FindContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/FindContent.jsp Mon Jun 22 20:11:42 2015
@@ -75,9 +75,6 @@
</div>
</div>
-
- <%-- loading progress bar / toggle .active class --%>
- <span id="spin" class="spin" style="position:absolute;display:none;"></span>
</form>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Footer.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Footer.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Footer.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Footer.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -25,8 +25,6 @@
<fmt:setBundle basename="templates.default"/>
<div class="footer">
- <div class="watermark">jspωiki</div>
-
<div class="copyright"><wiki:InsertPage page="CopyrightNotice"/></div>
<div class="wiki-version"><%=Release.APPNAME%> v<%=Release.getVersionString()%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupContent.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupContent.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -61,7 +61,7 @@
modifier = group.getModifier();
if ( group.getLastModified() != null )
{
- modified = Preferences.renderDate(WikiContext.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME) ;
+ modified = Preferences.renderDate(WikiContext.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME) ;
}
}
name = TextUtil.replaceEntities(name);
@@ -149,22 +149,21 @@
<form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
class="wikiform"
id="deleteGroup"
- onsubmit="return( confirm('<fmt:message key="grp.deletegroup.confirm"/>')
- && Wiki.submitOnce(this) );"
+ data-modal="<fmt:message key='grp.deletegroup.confirm'/>"
method="POST" accept-charset="UTF-8">
<wiki:Permission permission="editGroup">
- <a class="btn btn-primary"
+ <a class="btn btn-primary"
href="<wiki:Link format='url' jsp='EditGroup.jsp'><wiki:Param name='group' value='${param.group}' /></wiki:Link>" >
<%=LocaleSupport.getLocalizedMessage(pageContext, "actions.editgroup")%>
</a>
</wiki:Permission>
- <wiki:Permission permission="deleteGroup">
+ <wiki:Permission permission="deleteGroup">
<input class="btn btn-danger" type="submit" name="ok" value="<fmt:message key="actions.deletegroup"/>" />
<input type="hidden" name="group" value="${param.group}" />
- </wiki:Permission>
-
+ </wiki:Permission>
+
</form>
</div>
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/GroupTab.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -52,7 +52,7 @@
Group group = c.getEngine().getGroupManager().getGroup( name );
result.append( groupToJson( group, name, name.equals( groupname ), pageContext ) );
-
+
if( i+1<roles.length ){ result.append( ",\n" ); }
}
}
@@ -60,7 +60,7 @@
return result.toString();
}
-
+
/* json= {"name":"..","members":["a","b","c"] ,"createdon":"...","lastmodified":"...","cursor":yes|no} */
String groupToJson( Group group, String name, boolean cursor, PageContext pageContext )
@@ -71,34 +71,34 @@
StringBuffer ss = new StringBuffer();
MessageFormat mf = null;
Object[] args = null;
-
+
ss.append( "{ \"name\":\"" );
-
+
ss.append( name );
ss.append( "\",\"members\":[" );
-
- for( int j=0; j < m.length; j++ ) {
- ss.append( "\""+m[j].getName().trim()+"\"" );
+
+ for( int j=0; j < m.length; j++ ) {
+ ss.append( "\""+m[j].getName().trim()+"\"" );
if(j+1 < m.length) ss.append( "," );
}
-
+
ss.append( "],\"createdon\":\"" );
mf = new MessageFormat(LocaleSupport.getLocalizedMessage(pageContext, "grp.createdon") );
args = new Object[]{(group.getCreated()==null) ? "" : Preferences.renderDate(WikiContext.findContext( pageContext ), group.getCreated(),Preferences.TimeFormat.DATETIME), group.getCreator()};
ss.append( mf.format( args ) );
-
+
ss.append( "\",\"lastmodified\":\"" );
mf = new MessageFormat(LocaleSupport.getLocalizedMessage(pageContext, "grp.lastmodified") );
args = new Object[]{(group.getLastModified()==null) ? "" : Preferences.renderDate(WikiContext.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME), group.getModifier()};
ss.append( mf.format( args ) );
-
+
ss.append( "\",\"cursor\":" );
ss.append( ( cursor ) ? "true" : "false" );
-
+
ss.append( "}" );
return ss.toString();
-
+
}
%>
@@ -112,19 +112,19 @@
<label class="control-label form-col-20"><fmt:message key="group.name" /></label>
<%--
- <div id="grouptemplate"
- style="display:none; "
+ <div id="grouptemplate"
+ style="display:none; "
title='<fmt:message key="grp.groupnames.title"/>'
onclick="WikiGroup.toggle(); WikiGroup.onMouseOverGroup(this);"
onmouseover="WikiGroup.onMouseOverGroup(this);" >
</div>
--%>
<wiki:Permission permission="createGroups">
- <input type="text" size="30"
+ <input type="text" size="30"
class="form-control form-col-50"
id="newgroup"
value='<fmt:message key="grp.newgroupname"/>'
- onblur="if( this.value == '' ) { this.value = this.defaultValue; }; "
+ onblur="if( this.value == '' ) { this.value = this.defaultValue; }; "
onfocus="if( this.value == this.defaultValue ) { this.value = ''; WikiGroup.onClickNew(); }; ">
</wiki:Permission>
</div>
@@ -136,8 +136,8 @@
name="membersfield" id="membersfield" ></textarea>
</div>
<div class="form-group">
- <form action="<wiki:Link format='url' jsp='Group.jsp'/>"
- id="groupForm"
+ <form action="<wiki:Link format='url' jsp='Group.jsp'/>"
+ id="groupForm"
method="post" accept-charset="<wiki:ContentEncoding />" >
<input type="hidden" name="group" value="" />
@@ -145,35 +145,36 @@
<input type="hidden" name="action" value="save" />
<input type="button" disabled="disabled"
class="btn btn-primary form-col-offset-20"
- name="saveButton" id="saveButton"
- value='<fmt:message key="grp.savegroup"/>'
+ name="saveButton" id="saveButton"
+ value='<fmt:message key="grp.savegroup"/>'
onclick="WikiGroup.onSubmit( this.form, '<wiki:Link format='url' jsp='EditGroup.jsp' />' );" />
<wiki:Permission permission="createGroups">
- <input type="button" disabled="disabled"
+ <input type="button" disabled="disabled"
class="btn btn-default"
name="createButton" id="createButton"
- value='<fmt:message key="grp.savenewgroup"/>'
+ value='<fmt:message key="grp.savenewgroup"/>'
style="display:none; "
onclick="WikiGroup.onSubmitNew( this.form, '<wiki:Link format='url' jsp='NewGroup.jsp' />' );" />
</wiki:Permission>
<input type="button" disabled="disabled"
class="btn btn-default"
- name="cancelButton" id="cancelButton"
- value='<fmt:message key="grp.cancel"/>'
+ name="cancelButton" id="cancelButton"
+ value='<fmt:message key="grp.cancel"/>'
onclick="WikiGroup.toggle();" />
<wiki:Permission permission="deleteGroup">
- <input type="button" disabled="disabled"
+ <input type="button" disabled="disabled"
class="btn btn-danger"
name="deleteButton" id="deleteButton"
- value='<fmt:message key="grp.deletegroup"/>'
- onclick="confirm( '<fmt:message key="grp.deletegroup.confirm"/>' )
+ value='<fmt:message key="grp.deletegroup"/>'
+ data-modal='<fmt:message key="grp.deletegroup.confirm"/>'
+ xxonclick="confirm( '<fmt:message key="grp.deletegroup.confirm"/>' )
&& WikiGroup.onSubmit( this.form, '<wiki:Link format='url' jsp='DeleteGroup.jsp' />' );" />
</wiki:Permission>
</form>
-
+
<p class="help-block form-col-offset-20"><fmt:message key="grp.formhelp"/></p>
<p id="groupinfo" class="help-block"></p>
</div>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -24,23 +24,39 @@
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
- String frontpage = c.getEngine().getFrontPage();
+ String frontpage = c.getEngine().getFrontPage();
%>
-<div class="titlebox"><wiki:InsertPage page="TitleBox"/></div>
+
+<wiki:Plugin plugin="IfPlugin" args="page='TitleBox' contains='\\\\S' " >[{InsertPage page=TitleBox class=titlebox }]</wiki:Plugin>
<div class="header">
- <div class="watermark">jspωiki</div>
-<%-- <div class="application-logo" >
- <a href="<wiki:LinkTo page='<%=frontpage%>' format='url' />"
- title="<fmt:message key='actions.home.title' ><fmt:param><%=frontpage%></fmt:param></fmt:message> ">jspωiki</a>
+ <div class="topline">
+
+ <span class="cage pull-left">
+ <a class="logo pull-left"
+ href="<wiki:Link page='<%=frontpage%>' format='url' />"
+ title="<fmt:message key='actions.home.title' ><fmt:param><%=frontpage%></fmt:param></fmt:message> ">apache<b>jspωiki</b></a>
+
+ <wiki:PageExists page="LogoMenu">
+ <ul class="dropdown-menu" data-hover-parent=".cage" style="color:black;">
+ <li class="logo-menu"><wiki:InsertPage page="LogoMenu" /></li>
+ </ul>
+ </wiki:PageExists>
+ </span>
+
+ <wiki:Include page="UserBox.jsp" />
+ <wiki:Include page="SearchBox.jsp" />
+
</div>
---%>
- <wiki:Include page="SearchBox.jsp" />
+ <div class="pagename">
+ <wiki:CheckRequestContext context='view'><wiki:PageName /></wiki:CheckRequestContext>
+ <wiki:CheckRequestContext context='!view'><wiki:Link><wiki:PageName/></wiki:Link></wiki:CheckRequestContext>
+ </div>
- <div class="pagename"><wiki:PageName /></div>
+ <div class="breadcrumb">
+ <fmt:message key="header.yourtrail"/><wiki:Breadcrumbs separator="<span class='divider'></span>" />
+ </div>
- <div class="breadcrumb"><fmt:message key="header.yourtrail"/><wiki:Breadcrumbs /></div>
-
</div>
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/InfoContent.jsp Mon Jun 22 20:11:42 2015
@@ -85,10 +85,14 @@
<wiki:PageType type="page">
-<%-- part 1 : normal wiki pages
+<%-- part 1 : normal wiki pages
<wiki:TabbedSection defaultTab="info">
+ FIXME!!! =>>> <wiki:TabbedSection defaultTab="${param.tab}">
+ JSPWIKI-867) Deleting attachments should retain focus on the Attach
+
+
<wiki:Tab id="pagecontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "actions.view")%>'
accesskey="v"
@@ -133,7 +137,7 @@
class="form-group"
id="renameform"
method="post" accept-charset="<wiki:ContentEncoding />" >
-
+
<input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />
<input class="btn btn-primary" type="submit" name="rename" value="<fmt:message key='info.rename.submit' />" />
<input class="form-control form-col-50" type="text" name="renameto" value="<%= parm_renameto %>" size="40" />
@@ -152,7 +156,7 @@
class="form-group"
id="deleteForm"
method="post" accept-charset="<wiki:ContentEncoding />"
- onsubmit="return( confirm('<fmt:message key="info.confirmdelete"/>') && Wiki.submitOnce(this) );">
+ data-modal="<fmt:message key='info.confirmdelete'/>" >
<input class="btn btn-danger" type="submit" name="delete-all" id="delete-all"
value="<fmt:message key='info.delete.submit'/>" />
</form>
@@ -175,7 +179,7 @@
fmtkey="info.pagination"
href='<%=c.getURL(WikiContext.INFO, c.getPage().getName(), "start=%s")%>' />
- <div class="zebra-table sortable table-filter">
+ <div class="table-filter-hover-sort zebra-table">
<table class="wikitable" >
<tr>
<th><fmt:message key="info.version"/></th>
@@ -242,11 +246,15 @@
</tr>
<tr>
<td>
- <wiki:Link><wiki:PageName /></wiki:Link>
- <wiki:Plugin plugin="ReferringPagesPlugin" args="before='*' after='\n' " />
+ <div class="list-nostyle list-hover">
+ <wiki:Link><wiki:PageName /></wiki:Link>
+ <wiki:Plugin plugin="ReferringPagesPlugin" args="before='*' after='\n' " />
+ </div>
</td>
<td>
- <wiki:Plugin plugin="ReferredPagesPlugin" args="depth='1' type='local'" />
+ <div class="list-nostyle list-hover">
+ <wiki:Plugin plugin="ReferredPagesPlugin" args="depth='1' type='local'" />
+ </div>
</td>
</tr>
</table>
@@ -258,7 +266,7 @@
<wiki:Include page="DiffTab.jsp"/>
</div>
</wiki:CheckRequestContext>
-
+
</div>
@@ -292,7 +300,7 @@
<label>Select files <%--or drop them here!--%></label>
<input type="file" name="files" id="files" size="60"/>
<a class="hidden delete btn btn-danger btn-xs pull-right">Delete</a>
- </li>
+ </li>
</ul>
</div>
<div class="form-group">
@@ -302,11 +310,11 @@
<div class="form-group">
<input type="hidden" name="nextpage" value="<wiki:Link context='info' format='url'/>" /><%-- *** --%>
<input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
- <input class="btn btn-primary form-col-offset-20 form-col-50"
+ <input class="btn btn-primary form-col-offset-20 form-col-50"
type="submit" name="upload" id="upload" disabled="disabled" value="<fmt:message key='attach.add.submit'/>" />
<%--<input type="hidden" name="action" value="upload" />--%>
</div>
- <div class="hidden form-col-offset-20 form-col-80 progress progress-striped active">
+ <div class="hidden form-col-offset-20 form-col-50 progress progress-striped active">
<div class="progress-bar" data-progressid="<%=progressId%>" style="width: 100%;"></div>
</div>
@@ -322,8 +330,8 @@
class="form-group"
id="deleteForm"
method="post" accept-charset="<wiki:ContentEncoding />"
- onsubmit="return( confirm('<fmt:message key="info.confirmdelete"/>') );" >
-
+ data-modal="<fmt:message key='info.confirmdelete'/>" >
+
<input class="btn btn-danger" type="submit" name="delete-all" id="delete-all"
value="<fmt:message key='info.deleteattachment.submit' />" />
</form>
@@ -332,7 +340,7 @@
<%-- FIXME why not add pagination here - number of attach versions of one page limited ?--%>
<%--<h4><fmt:message key='info.attachment.history' /></h4>--%>
- <div class="slimbox-attachments sortable table-filter-hover-sort table-filter">
+ <div class="table-filter-hover-sort slimbox-attachments">
<table class="table">
<tr>
<th><fmt:message key="info.attachment.type"/></th>
@@ -398,7 +406,7 @@
</wiki:PageType>
-</wiki:PageExists>
+</wiki:PageExists>
<wiki:NoSuchPage>
<fmt:message key="common.nopage">
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/LoginContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/LoginContent.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/LoginContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/LoginContent.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -43,71 +43,53 @@
postURL = ctx.getURL( WikiContext.LOGIN, redir );
}
- boolean supportsCookieAuthentication = mgr.allowsCookieAuthentication();
%>
+<c:set var="allowsCookieAuthentication" value="<%= mgr.allowsCookieAuthentication() %>" />
<div class="page-content">
<%-- Login functionality --%>
<wiki:UserCheck status="notauthenticated">
<%--<wiki:Include page='LoginTab.jsp'/>--%>
-<div class="rightAccordion">
+<div class="accordion center form-col-50">
+
<h4><fmt:message key="login.heading.login"><fmt:param><wiki:Variable var="applicationname" /></fmt:param></fmt:message></h4>
<form action="<%=postURL%>"
id="login"
class=""
- onsubmit="return Wiki.submitOnce(this);"
method="post" accept-charset="<wiki:ContentEncoding />" >
-
- <div class="help-block"><fmt:message key="login.help"></fmt:message></div>
+ <%--<div class="help-block"><fmt:message key="login.help"></fmt:message></div>--%>
<div class="form-group">
<wiki:Messages div="error" topic="login"
prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"login.errorprefix")%>' />
</div>
<div class="form-group">
- <td><label class="control-label form-col-20" for="j_username"><fmt:message key="login.login"/></label></td>
- <td><input autofocus="autofocus" class="form-control form-col-50" type="text" size="24" value="<wiki:Variable var='uid' default='' />"
- name="j_username" id="j_username" /></td>
- </div>
- <div class="form-group">
- <td><label class="control-label form-col-20"for="j_password"><fmt:message key="login.password"/></label></td>
- <td><input class="form-control form-col-50" type="password" size="24"
- name="j_password" id="j_password" /></td>
+ <%--<label class="control-label form-col-20" for="j_username"><fmt:message key="login.login"/></label>--%>
+ <input autofocus="autofocus" class="form-control xform-col-50" type="text" size="24" value="<wiki:Variable var='uid' default='' />"
+ placeholder="<fmt:message key='login.login'/>"
+ name="j_username" id="j_username" />
+ </div>
+ <div class="form-group">
+ <%--<label class="control-label form-col-20"for="j_password"><fmt:message key="login.password"/></label>--%>
+ <input class="form-control xform-col-50" type="password" size="24"
+ placeholder="<fmt:message key='login.password'/>"
+ name="j_password" id="j_password" />
+ </div>
+ <c:if test="${allowsCookieAuthentication}">
+ <div class="form-group">
+ <label class="control-label xform-col-20" for="j_remember"><fmt:message key="login.remember"/></label>
+ <input type="checkbox"
+ name="j_remember" id="j_remember" />
</div>
- <% if( supportsCookieAuthentication ) { %>
- <div class="form-group">
- <td><label class="control-label form-col-20" for="j_remember"><fmt:message key="login.remember"/></label></td>
- <td><input type="checkbox"
- name="j_remember" id="j_remember" /></td>
- </div>
- <% } %>
+ </c:if>
<div class="form-group">
<input type="hidden" name="redirect" value="<wiki:Variable var='redirect' default='' />" />
- <input class="btn btn-primary form-col-offset-20" type="submit" name="submitlogin" value="<fmt:message key='login.submit.login'/>" />
+ <input class="btn btn-primary btn-block xform-col-offset-20" type="submit" name="submitlogin" value="<fmt:message key='login.submit.login'/>" />
</div>
-<%--
- <div class="help-block">
- <fmt:message key="login.lostpw"/>
- <a href="#" onclick="$('menu-lostpassword').fireEvent('click');"
- title="<fmt:message key='login.lostpw.title'/>" >
- <fmt:message key="login.lostpw.getnew"/>
- </a>
- </div>
- <div class="help-block">
- <fmt:message key="login.nopassword"/>
- <a href="#" onclick="$('menu-profile').fireEvent('click');"
- title="<fmt:message key='login.registernow.title'/>" >
- <fmt:message key="login.registernow">
- <fmt:param><wiki:Variable var="applicationname" /></fmt:param>
- </fmt:message>
- </a>
- </div>
---%>
-
</form>
@@ -132,7 +114,6 @@
</c:when>
<c:otherwise>
-
<c:if test="${param.tab eq 'lostpassword'}" >
<div class="form-group help-block">
<wiki:Messages div="error" topic="resetpw"
@@ -140,14 +121,17 @@
<wiki:Messages div="information" topic="resetpwok" />
</div>
</c:if>
+
<div class="form-group">
- <td><label class="control-label form-col-20" for="name"><fmt:message key="login.lostpw.name"/></label></td>
- <td><input class="form-control form-col-50" type="text" size="24" name="name" id="name" /></td>
+ <%--<label class="control-label form-col-20" for="name"><fmt:message key="login.lostpw.name"/></label>--%>
+ <input class="form-control xform-col-50" type="text" size="24"
+ placeholder="<fmt:message key='login.lostpw.name'/>"
+ name="name" id="name" />
</div>
- <div class="help-block form-col-offset-20"><fmt:message key="login.lostpw.help"></fmt:message></div>
+ <%--<div class="help-block form-col-offset-20"><fmt:message key="login.lostpw.help"></fmt:message></div>--%>
<div class="form-group">
<input type="hidden" name="action" value="resetPassword"/>
- <input class="btn btn-primary form-col-offset-20" type="submit" name="Submit" value="<fmt:message key='login.lostpw.submit'/>" />
+ <input class="btn btn-primary btn-block xform-col-offset-20" type="submit" name="Submit" value="<fmt:message key='login.lostpw.submit'/>" />
</div>
<%--
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Nav.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -27,26 +27,25 @@
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
- pageContext.setAttribute( "attachments", c.getEngine().getAttachmentManager().listAttachments( c.getPage() ).size() );
- String frontpage = c.getEngine().getFrontPage();
+ pageContext.setAttribute( "attachments", c.getEngine().getAttachmentManager().listAttachments( c.getPage() ).size() );
+ String frontpage = c.getEngine().getFrontPage();
%>
<%-- navigation bar --%>
-<div class="row">
+<div class="row sticky">
<ul class="nav nav-pills pull-left">
- <li>
- <a class="logo" href="<wiki:Link page='<%=frontpage%>' format='url' />"
- title="<fmt:message key='actions.home.title' ><fmt:param><%=frontpage%></fmt:param></fmt:message> ">apache jspωiki</a>
+ <%-- toggle sidebar --%>
+ <li id="menu"><a href="#"><!--≡-->☰</a></li>
+ <li class="pagename">
+ <wiki:CheckRequestContext context='view'><a href="#top"><wiki:PageName /></a></wiki:CheckRequestContext>
+ <wiki:CheckRequestContext context='!view'><wiki:Link><wiki:PageName/></wiki:Link></wiki:CheckRequestContext>
</li>
</ul>
<ul class="nav nav-pills pull-right">
- <%-- toggle sidebar --%>
- <li id="menu"><a href="#"><!--≡-->☰ Sidebar</a></li>
-
- <%-- view --%>
+ <%-- view
<wiki:CheckRequestContext context='info|diff|upload|rename|edit'>
<li id="view">
<wiki:PageType type="page">
@@ -54,25 +53,26 @@
<fmt:message key="view.tab"/>
</wiki:Link>
</wiki:PageType>
- <wiki:PageType type="attachment">
- <%--
- <wiki:Link page="<wiki:ParentPageName />" title="<fmt:message key='actions.viewparent'/>" >
- <fmt:message key="view.tab"/> Parent
- </wiki:Link>
- --%>
- <wiki:LinkToParent><fmt:message key="view.tab"/> Parent</wiki:LinkToParent>
- </wiki:PageType>
</li>
</wiki:CheckRequestContext>
-
+ --%>
+ <wiki:PageType type="attachment">
+ <li>
+ <wiki:LinkToParent><%-- <wiki:Link page="<wiki:ParentPageName/>" > --%>
+ <fmt:message key="info.backtoparentpage" >
+ <fmt:param><span class="label label-info label-sm"><wiki:ParentPageName/></span></fmt:param>
+ </fmt:message>
+ </wiki:LinkToParent>
+ </li>
+ </wiki:PageType>
<%-- attachment --%>
<wiki:CheckRequestContext context='view|info|rename|edit'>
<wiki:PageType type="page">
<li id="attach">
- <wiki:Link context="upload" accessKey="a" title="<fmt:message key='actions.attach.title'/>" >
+ <wiki:Link context="upload" accessKey="a" >
<fmt:message key='attach.tab'/>
- <c:if test="${attachments > 0}">
+ <c:if test="${attachments > 0}">
<span class="badge">${ attachments }</span>
</c:if>
</wiki:Link>
@@ -84,9 +84,9 @@
<wiki:CheckRequestContext context='view|upload|rename|edit'>
<li id="info">
<wiki:Link context="info" accessKey="i">
- <fmt:message key='info.tab'/><wiki:PageExists><span class="caret"></span></wiki:PageExists>
+ <fmt:message key='info.tab'/><wiki:PageExists><span class="caret"></span></wiki:PageExists>
</wiki:Link>
- <wiki:PageExists>
+ <wiki:PageExists>
<ul class="dropdown-menu pull-right" data-hover-parent="li">
<li class="dropdown-header">This is version <span class="badge"><wiki:PageVersion /></span></li>
<li class="dropdown-header">Last Changed on:</span></li>
@@ -98,31 +98,34 @@
</wiki:CheckVersion>
<%--fixme: Author sometimes returns a link(ok) or a plain text(bad formatting) --%>
<li class="dropdown-header">By:</span></li>
- <li><wiki:Author /></li>
- <li class="divider"></li>
- <li><wiki:RSSImageLink mode="wiki" /></li>
+ <li><wiki:Author /></li>
+ <li class="divider"></li>
+ <li><wiki:RSSImageLink mode="wiki" /></li>
+
</ul>
</wiki:PageExists>
</li>
- </wiki:CheckRequestContext>
-
+ </wiki:CheckRequestContext>
+
<%-- edit --%>
+ <wiki:PageType type="page">
<wiki:CheckRequestContext context='view|info|diff|upload|rename'>
- <li id="edit"
+ <li id="edit"
class="<wiki:Permission permission='!edit'>disabled</wiki:Permission>">
<wiki:PageType type="page">
- <wiki:Link context="edit" accessKey="e" title="<fmt:message key='actions.edit.title'/>" >
+ <wiki:Link context="edit" accessKey="e" >
<fmt:message key='actions.edit'/>
</wiki:Link>
</wiki:PageType>
<wiki:PageType type="attachment">
- <wiki:Link context="edit" page="<wiki:ParentPageName />" accessKey="e" title="<fmt:message key='actions.editparent'/>" >
+ <wiki:Link context="edit" page="<wiki:ParentPageName />" accessKey="e" >
<fmt:message key='actions.edit'/>
</wiki:Link>
</wiki:PageType>
</li>
</wiki:CheckRequestContext>
+ </wiki:PageType>
<%-- help slimbox-link --%>
@@ -145,7 +148,7 @@
<fmt:param><wiki:EditLink page="EditPageHelp">EditPageHelp</wiki:EditLink></fmt:param>
</fmt:message>
</div>
- </wiki:NoSuchPage>
+ </wiki:NoSuchPage>
--%>
</li>
</wiki:CheckRequestContext>
@@ -175,28 +178,47 @@
</wiki:Link>
<ul class="dropdown-menu pull-right" data-hover-parent="li">
- <%-- VIEW RAW PAGE SOURCE --%>
- <wiki:PageExists>
+ <wiki:PageExists>
<wiki:CheckRequestContext context='view|info|diff|upload|preview' >
+
+ <%-- VIEW RAW PAGE SOURCE --%>
<li>
<wiki:CheckVersion mode="latest">
<%--FIXME: wiki:Link doesnt support class=".." yet ; should be changed to className=".." --%>
- <a class="slimbox-link"
+ <a class="slimbox-link"
href="<wiki:Link format='url'><wiki:Param name='skin' value='raw'/></wiki:Link>"><fmt:message key='actions.rawpage' />
</a>
</wiki:CheckVersion>
<wiki:CheckVersion mode="notlatest">
- <a class="slimbox-link"
+ <a class="slimbox-link"
href="<wiki:Link format='url' version='${param.version}'><wiki:Param name='skin' value='raw'/></wiki:Link>"><fmt:message key='actions.rawpage' />
</a>
</wiki:CheckVersion>
</li>
+
+ <%-- Show Reader View --%>
+ <li>
+ <wiki:CheckVersion mode="latest">
+ <%--FIXME: wiki:Link doesnt support class=".." yet ; should be changed to className=".." --%>
+ <a class="reader-view"
+ href="<wiki:Link format='url'><wiki:Param name='skin' value='reader'/></wiki:Link>"><fmt:message key='actions.showreaderview' />
+ </a>
+ </wiki:CheckVersion>
+ <wiki:CheckVersion mode="notlatest">
+ <a class="reader-view"
+ href="<wiki:Link format='url' version='${param.version}'><wiki:Param name='skin' value='reader'/></wiki:Link>"><fmt:message key='actions.showreaderview' />
+ </a>
+ </wiki:CheckVersion>
+ </li>
+
</wiki:CheckRequestContext>
- </wiki:PageExists>
+ </wiki:PageExists>
+
+
<%-- ADD COMMENT --%>
<wiki:CheckRequestContext context='view|info|diff|upload'>
- <wiki:PageExists>
+ <wiki:PageExists>
<wiki:Permission permission="comment">
<wiki:PageType type="page">
<li>
@@ -206,17 +228,17 @@
</li>
</wiki:PageType>
<wiki:PageType type="attachment">
- <li>
+ <li>
<%--
<wiki:Link page="<wiki:ParentPageName />" context="comment" title="<fmt:message key='actions.comment.title' />">
<fmt:message key="actions.comment" />
</wiki:Link>
--%>
- <wiki:LinkToParent><fmt:message key="actions.comment" /> To Parent</wiki:LinkToParent>
+ <wiki:LinkToParent><fmt:message key="actions.comment" /> To Parent</wiki:LinkToParent>
</li>
</wiki:PageType>
</wiki:Permission>
- </wiki:PageExists>
+ </wiki:PageExists>
</wiki:CheckRequestContext>
<%-- WORKFLOW --%>
@@ -244,18 +266,18 @@
<%-- divider --%>
<wiki:PageExists page="MoreMenu">
- <wiki:CheckRequestContext context='view|info|diff|upload|prefs'>
+ <wiki:CheckRequestContext context='view|info|diff|upload|prefs|workflow|createGroup'>
<li class="divider "></li>
</wiki:CheckRequestContext>
<li class="more-menu"><wiki:InsertPage page="MoreMenu" /></li>
</wiki:PageExists>
-
+
</ul>
</li>
</ul>
-
+
</div>
<%--
<wiki:PageExists>
@@ -264,6 +286,6 @@
<wiki:Include page="AttachmentTab.jsp"/>
</wiki:Tab>
</wiki:PageType>
-
+
</wiki:PageExists>
--%>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -30,19 +30,14 @@
<%-- Main Content Section --%>
<%-- This has been source ordered to come first in the markup (and on small devices)
but to be to the right of the nav on larger screens --%>
-<div class="page-content">
+<div class="page-content <wiki:Variable var='page-styles' />">
<wiki:Include page="PageTab.jsp"/>
-
+
<wiki:PageType type="attachment">
- <div class="information">
- <fmt:message key="info.backtoparentpage" >
- <fmt:param><wiki:Link page="<wiki:ParentPageName/>" ><wiki:ParentPageName/></wiki:Link></fmt:param>
- </fmt:message>
- </div>
<div><%-- insert the actual attachement, image, etc... --%>
<wiki:Translate>[<%= WikiContext.findContext( pageContext ).getPage().getName() %>]</wiki:Translate>
</div>
- </wiki:PageType>
-
-</div>
+ </wiki:PageType>
+
+</div>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageInfo.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageInfo.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageInfo.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageInfo.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -24,8 +24,8 @@
<fmt:setBundle basename="templates.default"/>
<wiki:CheckRequestContext context='view|diff|edit|upload|info'>
-<div class="page-footer">
- <wiki:PageExists>
+<div class="page-footer visible-print">
+ <wiki:PageExists>
<wiki:CheckVersion mode="latest">
<fmt:message key="info.lastmodified">
<fmt:param><wiki:PageVersion /></fmt:param>
@@ -39,10 +39,10 @@
<fmt:param><wiki:Author /></fmt:param>
</fmt:message>
</wiki:CheckVersion>
- <wiki:RSSImageLink mode="wiki" />
+ <wiki:RSSImageLink mode="wiki" />
<a href="#top" title="<fmt:message key='actions.gototop'/>" class="btn">Top<span class="caret-up"><span></a>
</wiki:PageExists>
- <wiki:NoSuchPage><fmt:message key="actions.notcreated"/></wiki:NoSuchPage>
+ <wiki:NoSuchPage><fmt:message key="actions.notcreated"/></wiki:NoSuchPage>
</div>
</wiki:CheckRequestContext>
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageTab.jsp Mon Jun 22 20:11:42 2015
@@ -14,12 +14,13 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %><%--CHECK why is this needed --%>
<fmt:setLocale value="${prefs.Language}" />
@@ -43,30 +44,30 @@
<%-- If the page is an older version, then offer a note and a possibility
to restore this version as the latest one. --%>
<wiki:CheckVersion mode="notlatest">
- <form action="<wiki:Link format='url' jsp='Wiki.jsp'/>"
+ <form action="<wiki:Link format='url' jsp='Wiki.jsp'/>"
method="get" accept-charset='UTF-8'>
- <input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />
+ <input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />
<div class="error center">
<label>
<fmt:message key="view.oldversion">
<fmt:param>
<%--<wiki:PageVersion/>--%>
<select id="version" name="version" onchange="this.form.submit();" >
-<%
+<%
int latestVersion = c.getEngine().getPage( pagename, WikiProvider.LATEST_VERSION ).getVersion();
if( thisVersion == WikiProvider.LATEST_VERSION ) thisVersion = latestVersion; //should not happen
- for( int i = 1; i <= latestVersion; i++)
+ for( int i = 1; i <= latestVersion; i++)
{
-%>
+%>
<option value="<%= i %>" <%= ((i==thisVersion) ? "selected='selected'" : "") %> ><%= i %></option>
<%
- }
+ }
%>
</select>
</fmt:param>
- </fmt:message>
+ </fmt:message>
</label>
<div>
<a class="btn btn-primary" href="<wiki:Link format='url'/>">
@@ -82,10 +83,12 @@
</wiki:CheckVersion>
<%-- Inserts no text if there is no page. --%>
+<%
+// pageContext.setAttribute( "sidebar", t.listSkins(pageContext, c.getTemplate() ) );
+%>
<wiki:InsertPage />
-
-<%-- Inserts blogcomment if appropriate
+<%-- Inserts blogcomment if appropriate
<% if( !blogpage.equals("") ) { %>
--%>
@@ -98,7 +101,7 @@
<div class="weblogcomments"><wiki:InsertPage page="<%= blogcommentpage%>" /></div>
</wiki:PageExists>
<% }; %>
- <div class="information">
+ <div class="information">
<wiki:Link page="<%= mainblogpage %>"><fmt:message key="blog.backtomain"/></wiki:Link>
<wiki:Link context="comment" page="<%= blogcommentpage%>" ><fmt:message key="blog.addcomments"/></wiki:Link>
</div>
@@ -108,6 +111,7 @@
<wiki:NoSuchPage>
<%-- FIXME: Should also note when a wrong version has been fetched. --%>
+ <%-- FIXME: Should add .createpage class to the EditLink, to color red. Not possible with wiki:EditLink --%>
<div class="information" >
<fmt:message key="common.nopage">
<fmt:param><wiki:EditLink><fmt:message key="common.createit"/></wiki:EditLink></fmt:param>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp Mon Jun 22 20:11:42 2015
@@ -41,8 +41,8 @@
TemplateManager t = c.getEngine().getTemplateManager();
pageContext.setAttribute( "skins", t.listSkins(pageContext, c.getTemplate() ) );
pageContext.setAttribute( "languages", t.listLanguages(pageContext) );
- pageContext.setAttribute( "timeformats", t.listTimeFormats(pageContext) );
pageContext.setAttribute( "timezones", t.listTimeZones(pageContext) );
+ pageContext.setAttribute( "timeformats", t.listTimeFormats(pageContext) );
pageContext.setAttribute( "hasMultipleEditors", c.getEngine().getEditorManager().getEditorList().length > 1 );
%>
@@ -63,12 +63,12 @@
<div class="form-group">
<label class="control-label form-col-20" for="assertedName"><fmt:message key="prefs.assertedname"/></label>
- <input class="form-control form-col-50" type="text" id="assertedName" name="assertedName" size="20"
+ <input class="form-control form-col-50" type="text" id="assertedName" name="assertedName" size="20"
autofocus="autofocus"
value="<wiki:UserProfile property='wikiname' />" />
<%-- CHECK THIS
<input type="text" id="assertedName" name="assertedName" size="20" value="<wiki:UserProfile property='loginname'/>" />
- --%>
+ --%>
</div>
<wiki:UserCheck status="anonymous">
@@ -81,42 +81,43 @@
</a>
</fmt:param>
</fmt:message>
- </div>
+ </div>
</wiki:UserCheck>
<c:if test='${hasMultipleEditors}'>
<div class="form-group">
<label class="control-label form-col-20" for="editor"><fmt:message key="edit.chooseeditor"/></label>
-
+
<select class="" id="editor" name="editor" data-pref="editor">
<wiki:EditorIterator id="edt">
<option <%=edt.isSelected()%> value="<%=edt.getName()%>"><%=edt.getName()%></option>
</wiki:EditorIterator>
</select>
-
+
</div>
</c:if>
<div class="form-group">
- <label class="btn btn-default form-col-offset-20" for="prefSectionEditing">
+ <label class="control-label form-col-20" for="prefSectionEditing"><fmt:message key="prefs.user.sectionediting"/></label>
+
+ <label class="btn btn-default" for="prefSectionEditing">
<input class="" id="prefSectionEditing" name="prefSectionEditing" data-pref="SectionEditing"
type="checkbox" ${prefs.SectionEditing=='on' ? 'checked="checked"' : ''} >
- <fmt:message key="prefs.user.sectionediting"/>
+ <fmt:message key="prefs.user.sectionediting.text"/>
</label>
- <fmt:message key="prefs.user.sectionediting.text"/>
-
+
</div>
<c:if test='${not empty skins}'>
<div class="form-group">
<label class="control-label form-col-20" for="prefSkin"><fmt:message key="prefs.user.skin"/></label>
-
+
<select class="" id="prefSkin" name="prefSkin" data-pref="SkinName">
<c:forEach items="${skins}" var="i">
<option value='${i}' ${prefs.SkinName==i ? 'selected="selected"' : ''} >${i}</option>
</c:forEach>
</select>
-
+
</div>
</c:if>
@@ -125,65 +126,63 @@
<c:set var="prefLanguage" ><c:out value="${prefs.Language}" default="<%=request.getLocale().toString()%>" /></c:set>
<div class="form-group">
<label class="control-label form-col-20" for="prefLanguage"><fmt:message key="prefs.user.language"/></label>
-
+
<select class="" id="prefLanguage" name="prefLanguage" data-pref="Language">
<c:forEach items='${languages}' var='lg'>
<option value="<c:out value='${lg.key}'/>" ${fn:startsWith(prefLanguage,lg.key) ? 'selected="selected"' : ''} >${lg.value}</option>
</c:forEach>
</select>
-
+
</div>
</c:if>
<div class="form-group">
- <label class="control-label form-col-20" for="prefOrientation"><fmt:message key="prefs.user.orientation"/></label>
-
- <select class="" id="prefOrientation" name="prefOrientation" data-pref="Orientation">
- <option value='fav-left' ${prefs.Orientation=='fav-left' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.orientation.left"/></option>
- <option value='fav-right' ${prefs.Orientation=='fav-right' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.orientation.right"/></option>
- </select>
-
- </div>
+ <label class="control-label form-col-20" for="prefOrientation"><fmt:message key="prefs.user.layout"/></label>
- <div class="form-group">
- <label class="control-label form-col-20" for="prefLayout"><fmt:message key="prefs.user.layout"/></label>
<select class="" id="prefLayout" name="prefLayout" data-pref="Layout">
<option value='fluid' ${prefs.Layout=='fluid' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.layout.fluid"/></option>
<option value='fixed' ${prefs.Layout=='fixed' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.layout.fixed"/></option>
</select>
+
+ <select class="" id="prefOrientation" name="prefOrientation" data-pref="Orientation">
+ <option value='fav-left' ${prefs.Orientation=='fav-left' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.orientation.left"/></option>
+ <option value='fav-right' ${prefs.Orientation=='fav-right' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.orientation.right"/></option>
+ <option value='fav-hidden' ${prefs.Orientation=='fav-hidden' ? 'selected="selected"' : ''} ><fmt:message key="prefs.user.orientation.hidden"/></option>
+ </select>
+
</div>
<div class="form-group">
<label class="control-label form-col-20" for="prefTimeFormat"><fmt:message key="prefs.user.timeformat"/></label>
-
+
<select class="" id="prefTimeFormat" name="prefTimeFormat" data-pref="DateFormat">
<c:forEach items='${timeformats}' var='tf' >
<option value='<c:out value="${tf.key}"/>' ${prefs.DateFormat==tf.key ? 'selected="selected"' : ''} >${tf.value}</option>
</c:forEach>
</select>
-
+
</div>
<div class="form-group">
<label class="control-label form-col-20" for="prefTimeZone"><fmt:message key="prefs.user.timezone"/></label>
-
+
<select class="" id='prefTimeZone' name='prefTimeZone' data-pref="TimeZone">
<c:forEach items='${timezones}' var='tz'>
<option value='<c:out value="${tz.key}"/>' ${prefs.TimeZone==tz.key ? 'selected="selected"' : ''} >${tz.value}</option>
</c:forEach>
</select>
-
+
</div>
<div class="form-group">
-
+
<input class="btn btn-primary form-col-offset-20" type="submit" name="ok" value="<fmt:message key='prefs.save.prefs.submit'/>"
accesskey="s" />
<input type="hidden" name="redirect" value="<wiki:Variable var='redirect' default='' />" />
<input type="hidden" name="action" value="setAssertedName" />
<p class="help-block form-col-offset-20"><fmt:message key='prefs.cookies'/></p>
-
+
</div>
</form>
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ProfileTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ProfileTab.jsp?rev=1686927&r1=1686926&r2=1686927&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ProfileTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ProfileTab.jsp Mon Jun 22 20:11:42 2015
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
@@ -38,12 +38,12 @@
<wiki:UserProfile property="new"><fmt:message key="prefs.newprofile"/></wiki:UserProfile>
</h3>
-<form action="<wiki:CheckRequestContext
+<form action="<wiki:CheckRequestContext
context='login'><wiki:Link jsp='Login.jsp' format='url'><wiki:Param name='tab'
- value='profile'/></wiki:Link></wiki:CheckRequestContext><wiki:CheckRequestContext
+ value='profile'/></wiki:Link></wiki:CheckRequestContext><wiki:CheckRequestContext
context='prefs'><wiki:Link jsp='UserPreferences.jsp' format='url'><wiki:Param name='tab'
- value='profile'/></wiki:Link></wiki:CheckRequestContext>"
- id="editProfile"
+ value='profile'/></wiki:Link></wiki:CheckRequestContext>"
+ id="editProfile"
class=""
method="post" accept-charset="UTF-8">
@@ -79,31 +79,31 @@
<wiki:UserProfile property="canChangePassword">
<div class="form-group">
<label class="control-label form-col-20" for="password"><fmt:message key="prefs.password"/></label>
-
+
<%--FIXME Enter Old PW to validate change flow, not yet treated by JSPWiki
<label class="control-label form-col-20" for="password0">Old</label>
<input type="password" name="password0" id="password0" size="20" value="" />
--%>
<input class="form-control form-col-50" type="password" name="password" id="password" size="20" value="" />
-
+
</div>
<div class="form-group">
<label class="control-label form-col-20" for="password2"><fmt:message key="prefs.password2"/></label>
-
+
<input class="form-control form-col-50" type="password" name="password2" id="password2" size="20" value="" />
<%-- extra validation ? min size, allowed chars? password-strength js routing --%>
-
+
</div>
</wiki:UserProfile>
<!-- Full name -->
<div class="form-group">
<label class="control-label form-col-20" for="fullname"><fmt:message key="prefs.fullname"/></label>
-
+
<input class="form-control form-col-50" type="text" name="fullname" id="fullname"
size="20" value="<wiki:UserProfile property='fullname'/>" />
<p class="help-block form-col-offset-20"><fmt:message key="prefs.fullname.description"/></p>
-
+
</div>
<!-- E-mail -->
@@ -122,11 +122,11 @@
</div>
<div class="xform-group"> <%--class="additinfo"--%>
<label class="control-label form-col-20"><fmt:message key="prefs.groups"/></label>
-
+
<%-- TODO this should become clickable group links so you can immediately go and look at them if you want --%>
<div class="form-control-static form-col-50"><wiki:UserProfile property="groups" /></div>
<p class="help-block form-col-offset-20"><fmt:message key="prefs.acl.info" /></p>
-
+
</div>
<div class="xform-group"> <%--class="additinfo"--%>
@@ -141,12 +141,12 @@
<div class="form-control-static form-col-50">
<%--<wiki:UserProfile property="modified"/>--%>
<fmt:formatDate value="<%= profile.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
- </div>
+ </div>
</div>
</div>
</wiki:UserProfile>
- <div class="form-group">
+ <div class="form-group">
<wiki:UserProfile property="exists">
<input class="btn btn-primary form-col-offset-20" type="submit" name="ok" value="<fmt:message key='prefs.oldprofile'/>" />
<%--input class="btn btn-primary form-col-offset-20" type="submit" name="ok" value="<fmt:message key='prefs.save.submit' />" /--%>