Return-Path: X-Original-To: apmail-jspwiki-commits-archive@www.apache.org Delivered-To: apmail-jspwiki-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 19EBC18F0F for ; Sun, 26 Jul 2015 19:50:45 +0000 (UTC) Received: (qmail 58981 invoked by uid 500); 26 Jul 2015 19:50:44 -0000 Delivered-To: apmail-jspwiki-commits-archive@jspwiki.apache.org Received: (qmail 58936 invoked by uid 500); 26 Jul 2015 19:50:44 -0000 Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jspwiki.apache.org Delivered-To: mailing list commits@jspwiki.apache.org Received: (qmail 58914 invoked by uid 99); 26 Jul 2015 19:50:44 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Jul 2015 19:50:44 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id DA90FAC0586 for ; Sun, 26 Jul 2015 19:50:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1692754 [2/2] - in /jspwiki/trunk/jspwiki-war/src/main: config/wro/ java/org/apache/wiki/ java/org/apache/wiki/tags/ java/org/apache/wiki/ui/ java/org/apache/wiki/util/ resources/META-INF/ resources/templates/ scripts/behaviors/ scripts/mo... Date: Sun, 26 Jul 2015 19:50:42 -0000 To: commits@jspwiki.apache.org From: brushed@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150726195043.DA90FAC0586@hades.apache.org> 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=1692754&r1=1692753&r2=1692754&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 Sun Jul 26 19:50:41 2015 @@ -17,177 +17,162 @@ under the License. --%> -<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %> <%@ page import="java.security.Principal" %> <%@ page import="java.text.MessageFormat" %> <%@ page import="java.util.*" %> <%@ page import="org.apache.wiki.WikiContext" %> <%@ page import="org.apache.wiki.auth.*" %> +<%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.auth.PrincipalComparator" %> <%@ page import="org.apache.wiki.auth.authorize.Group" %> +<%@ page import="org.apache.wiki.auth.permissions.GroupPermission" %> <%@ page import="org.apache.wiki.auth.authorize.GroupManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> <%@ page import="org.apache.log4j.*" %> <%@ page errorPage="/Error.jsp" %> -<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> +<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %> +<%@ 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.*" %> -<%! - - /* json=[ group1, group2, .. ] */ - String groupsToJson(PageContext pageContext,String groupname) throws NoSuchPrincipalException { - - WikiContext c = WikiContext.findContext( pageContext ); - Principal[] roles = c.getWikiSession().getRoles(); - - StringBuffer result = new StringBuffer(); - - result.append( "[" ); - for( int i = 0; i < roles.length; i++ ) - { - if ( roles[i] instanceof GroupPrincipal ) /* bugfix */ - { - String name = roles[i].getName(); - Group group = c.getEngine().getGroupManager().getGroup( name ); - - result.append( groupToJson( group, name, name.equals( groupname ), pageContext ) ); - - if( i+1 + - return ss.toString(); + + +
- } +

+ -%> - + + -
- - - <%-- - - --%> - +
+ - -
+ name="group" id="group" + placeholder="" > +
-
- +
+ + +
+
+ <%--

--%> - -
-
- - - - - - - - - - - - - - - ' ) - && WikiGroup.onSubmit( this.form, '' );" /> - - + -

-

-
-
- -

[{Groups}]

- - - -<%-- - ---%> -<%-- -WikiGroup.putGroup( "Group1qsdf qsdf qsdf qsdf qsdffsdfq en nog een beetje langer he", "Member1\nMember2\nMember3\nMember4\nMember5\nMember6", "createdon", "createdby", "changedon", "changedby" ); ---%> + + -
\ No newline at end of file + + + + + + + +
+ + + + + + + + + + + + <% + for( int g = 0; g < groups.length; g++ ) + { + if ( groups[g] instanceof GroupPrincipal ) + { + name = groups[g].getName(); + group = groupMgr.getGroup( name ); + members = group.members(); + Arrays.sort( members, new PrincipalComparator() ); + + membersAsString = new StringBuffer(); + for ( int i = 0; i < members.length; i++ ) + { + membersAsString.append( members[i].getName().trim() ); + if( i+1 < members.length ){ membersAsString.append( ", " ); } + } + + %> + + + + <%----%> + + + + + + + + + + + <% + } /* end of if-GroupPrincipal */ + } /* end of for loop */ + %> + +
${group.name} ${group.name}${members}${group.creator}${group.modifier} + <%-- + We can't use wiki:Permission, cause we are in a loop; so let's just borrow some code from PermissionTag.java + --%> + + <%-- --%> + + + + <%----%> + + + + <%-- --%> + + <%----%> + +
+
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=1692754&r1=1692753&r2=1692754&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 Sun Jul 26 19:50:41 2015 @@ -52,7 +52,11 @@
- + + + + +
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=1692754&r1=1692753&r2=1692754&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 Sun Jul 26 19:50:41 2015 @@ -17,7 +17,6 @@ under the License. --%> -<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page import="org.apache.wiki.auth.permissions.*" %> @@ -26,9 +25,11 @@ <%@ page import="org.apache.wiki.preferences.Preferences" %> <%@ page import="org.apache.wiki.util.TextUtil" %> <%@ page import="java.security.Permission" %> -<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> <% @@ -73,38 +74,30 @@ if( parm_start != null ) startitem = Integer.parseInt( parm_start ) ; /* round to start of block: 0-19 becomes 0; 20-39 becomes 20 ... */ - if( startitem > -1 ) startitem = ((startitem)/pagesize) * pagesize; + if( startitem > -1 ) startitem = ( startitem / pagesize ) * pagesize; /* startitem drives the pagination logic */ /* startitem=-1:show all; startitem=0:show block 1-20; startitem=20:block 21-40 ... */ %> +<%-- +FIXME +When deleting an Attachment, the Delete.jsp still redirects to InfoContent.jsp, iso Upload.jsp ! +As we currently do not want to touch the top-level JSP's and keep them compatible with the +defaul template, let's fix this here +--%> + + +
- -<%-- part 1 : normal wiki pages - - - - FIXME!!! =>>> - JSPWIKI-867) Deleting attachments should retain focus on the Attach - - - - <%-- --> - ---%> -

- 1 + 1 @@ -142,7 +135,7 @@ @@ -168,19 +161,15 @@

-
-
- <%-- - - --%> - <%-- if( itemcount > 1 ) { --%> +
+

History

-
- +
+
@@ -191,85 +180,76 @@ - <% if( ( startitem == -1 ) || - ( ( currentPage.getVersion() > startitem ) - && ( currentPage.getVersion() <= startitem + pagesize ) ) ) - { - %> + + + - - - - + + - <% } %> +
- + - + + + +   + | - - <% String changenote = (String) currentPage.getAttribute( WikiPage.CHANGENOTE ); %> - <%= (changenote==null) ? "" : changenote %> - ${changenote}
${pagination} - <%-- } /* itemcount > 1 */ --%> -
-
- +

Page References

+
-
-
+
-
+
-
+ <%-- DIFF section --%> -
+

Difference

-
- @@ -277,12 +257,11 @@ <% int MAXATTACHNAMELENGTH = 30; - String progressId = c.getEngine().getProgressManager().getNewProgressIdentifier(); %> - + -
--%>
@@ -324,28 +303,34 @@
- - <%--

--%> -
- + + + ${parentPage} + + + + + - -
+ + -<%-- FIXME why not add pagination here - number of attach versions of one page limited ?--%> +<%-- TODO why no pagination here - number of attach versions of one page limited ?--%> <%--

--%> - -
+
- - <%----%> + + @@ -358,31 +343,25 @@ <%-- --%> - <% - String name = att.getName(); //att.getFileName(); - int dot = name.lastIndexOf("."); - String attachtype = ( dot != -1 ) ? name.substring(dot+1) : " "; - - String sname = name; - if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "..."; - %> - - <%----%> - <%--FIXME classs parameter throws java exception - - --%> - - + + <%-- see styles/fontjspwiki/icon.less : icon-file-<....>-o --%> + + + + + + + - + <%-- // FIXME: This needs to be added, once we figure out what is going on. @@ -394,10 +373,10 @@ --%> - + + + + <%-- --%> @@ -415,3 +394,6 @@ + + + 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=1692754&r1=1692753&r2=1692754&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 Sun Jul 26 19:50:41 2015 @@ -17,30 +17,30 @@ under the License. --%> -<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page errorPage="/Error.jsp" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %> <%@ 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.*" %> <% - String postURL = ""; WikiContext ctx = WikiContext.findContext( pageContext ); AuthenticationManager mgr = ctx.getEngine().getAuthenticationManager(); + String loginURL = ""; if( mgr.isContainerAuthenticated() ) { - postURL = "j_security_check"; + loginURL = "j_security_check"; } else { String redir = (String)ctx.getVariable("redirect"); if( redir == null ) redir = ctx.getEngine().getFrontPage(); - postURL = ctx.getURL( WikiContext.LOGIN, redir ); + loginURL = ctx.getURL( WikiContext.LOGIN, redir ); } %> @@ -51,56 +51,82 @@ <%----%> -
+
-

+

-
+ <%--
--%> - + +
- <%----%> - +
+
- <%----%> - +
+ +
<%-- need clearfix ico no-cookies-auth allowed; ensure the right floated btn gets proper spacing -- ugh! --%> -
- - -
+ + + +
+
- - + +
+
+ + <%--CHECKME only allow to register new uses when no container auth !? --%> + <%-- --%> + + <%-- --%> + <%-- Lost pasword functionality --%> -

<%=LocaleSupport.getLocalizedMessage(pageContext, "login.lostpw.tab")%>

+ +

- <%--

--%> + @@ -112,46 +138,44 @@

- -
- +
+ + -
+
- <%----%> - +

+ <%----%> +
- <%--
--%>
- - + +
-<%-- -
- - - - -
-
- - <.----.> - - - - - -
---%> +
+ + + + @@ -160,13 +184,95 @@ <%-- Register new user profile --%> - -

<%=LocaleSupport.getLocalizedMessage(pageContext, "login.register.tab")%>

- - + +

-
+<%-- --%> + + + + + + + + + + <%-- Login name --%> + <%-- TODO: can be simplified in case of registering a new user --%> +
+ + + + + + + +
+ + + +
+ + +
+ + <%-- Password field; not displayed if container auth used --%> + +
+ +
+
+ + <%-- FFS: extra validation ? min size, allowed chars? password-strength js check --%> +
+ + + <%-- Full name --%> +
+ +

+
+ + <%-- E-mail --%> +
+ +

+
+ +
+ +
+ +
+ + + + + +
+ \ No newline at end of file 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=1692754&r1=1692753&r2=1692754&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 Sun Jul 26 19:50:41 2015 @@ -56,28 +56,19 @@ --%> - -
  • - <%-- --%> - - - - -
    • -     <%-- attachment --%> - - +
  • - - - - ${ attachments } - + + + + + + + ${attachments}
    • -     <%-- info --%> @@ -221,7 +212,7 @@
  • - +
    • @@ -244,14 +235,14 @@
  • - +
    • - <%-- GROUPS --%> + <%-- GROUPS : moved to the UserBox.jsp
  • @@ -261,11 +252,12 @@
    • + --%> <%-- divider --%> - +
  • Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/NewGroupContent.jsp URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/NewGroupContent.jsp?rev=1692754&r1=1692753&r2=1692754&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/NewGroupContent.jsp (original) +++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/NewGroupContent.jsp Sun Jul 26 19:50:41 2015 @@ -14,89 +14,8 @@ "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="java.security.Principal" %> -<%@ page import="java.util.Arrays" %> -<%@ page import="java.util.ResourceBundle" %> -<%@ page import="org.apache.wiki.*" %> -<%@ page import="org.apache.wiki.auth.PrincipalComparator" %> -<%@ page import="org.apache.wiki.auth.authorize.Group" %> -<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %> -<%@ page import="org.apache.wiki.util.TextUtil" %> -<%@ page errorPage="/Error.jsp" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ page import="javax.servlet.jsp.jstl.fmt.*" %> - - -<% - // Extract the group name and members - String name = request.getParameter( "group" ); - - Group group = (Group)pageContext.getAttribute( "Group",PageContext.REQUEST_SCOPE ); - Principal[] members = null; - - if ( group != null ) - { - name = group.getName(); - members = group.members(); - Arrays.sort( members, new PrincipalComparator() ); - } - - // FIXME : find better way to i18nize default group name - if ( "MyGroup".equals(name) ) - { - name = LocaleSupport.getLocalizedMessage(pageContext, "newgroup.defaultgroupname"); - } - - name = TextUtil.replaceEntities(name); -%> - -
    - -

    - - - -
    " - method="POST" accept-charset="UTF-8"> - -
    - -
    - -
    - - -
    - -
    -
    - - - <% - StringBuffer s = new StringBuffer(); - for ( int i = 0; i < members.length; i++ ) - { - s.append( members[i].getName().trim() ); - s.append( '\n' ); - } - %> -
    - - -
    - -
    -
    - - " /> - -
    - -
    - - -
    \ No newline at end of file + Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp?rev=1692754&r1=1692753&r2=1692754&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp (original) +++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesContent.jsp Sun Jul 26 19:50:41 2015 @@ -17,37 +17,42 @@ under the License. --%> -<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.ui.*" %> +<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %> +<%@ 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.*" %> -<% - WikiContext context = WikiContext.findContext( pageContext ); - TemplateManager.addResourceRequest( context, TemplateManager.RESOURCE_SCRIPT, - context.getURL( WikiContext.NONE, "scripts/haddock-prefs.js" ) ); -%> +
    -
    +
    -

    +

    + +

    <%-- --%> - <%-- --%> -

    + + +

    <%-- <%=LocaleSupport.getLocalizedMessage(pageContext, "prefs.tab.profile")%> --%> - <%--     --%> +     <%--     --%> - <%-- FIXME check right permissions --%> -

    + <%-- use WikiPermission --%> + + + data-activePane + +

    +
    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=1692754&r1=1692753&r2=1692754&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 Sun Jul 26 19:50:41 2015 @@ -44,8 +44,7 @@ %>
    + id="preferences" <%-- see Prefs.js; setCookie --%> method="post" accept-charset="" > @@ -53,6 +52,7 @@
    +
    <%= attachtype %>
    		<%= sname %> -   + + ${type}${att.fileName} +   - + + + - <% String changenote = (String) att.getAttribute( WikiPage.CHANGENOTE ); %> - <%= (changenote==null) ? "" : changenote %> - ${changenote}