Skip to content
Snippets Groups Projects
Commit d9099502 authored by Manuel Leduc's avatar Manuel Leduc
Browse files

XWIKI-19876: The Back button is barely shown when requesting to join a subwiki

parent fb49b4f2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/src/main/resources/WikiManager/JoinWiki.xml
+ 37
− 21
View file @ d9099502
......@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
<xwikidoc version="1.1">
<xwikidoc version="1.5" reference="WikiManager.JoinWiki" locale="">
<web>WikiManager</web>
<name>JoinWiki</name>
<language/>
......@@ -146,20 +146,28 @@
&lt;dd&gt;
$existingInvitation.get('reviewerComment').getValue()
&lt;/dd&gt;
#end
#end
&lt;dt&gt;
&lt;label for='userComment'&gt;{{translation key="platform.wiki.users.invitation.reply.title"/}}&lt;/label&gt;
&lt;span class='xHint'&gt;{{translation key="platform.wiki.users.invitation.reply.hint"/}}&lt;/span&gt;
&lt;/dt&gt;
&lt;dd&gt;&lt;textarea name='userComment' rows='7' cols='45'&gt;&lt;/textarea&gt;&lt;/dd&gt;
&lt;span class='buttonwrapper'&gt;
&lt;br/&gt;
&lt;input type='submit' name='acceptInvitation' value="$services.localization.render('platform.wiki.users.invitation.accept.label')" class='button'/&gt;
&lt;input type='submit' name='rejectInvitation' value="$services.localization.render('platform.wiki.users.invitation.reject.label')" class='button'/&gt;
&lt;a href="$backUrl" class='button secondary'&gt;{{translation key="platform.wiki.users.invitation.postpone.label"/}}&lt;/a&gt;
&lt;/span&gt;
&lt;input type="hidden" name="wikiId" value="$!escapetool.xml($wikiId)" /&gt;
&lt;input type="hidden" name="form_token" value="$!escapetool.xml($services.csrf.getToken())" /&gt;
&lt;dd&gt;
&lt;span class='buttonwrapper'&gt;
&lt;br/&gt;
&lt;input type='submit' name='acceptInvitation'
value="$services.localization.render('platform.wiki.users.invitation.accept.label')"
class='button'/&gt;
&lt;input type='submit' name='rejectInvitation'
value="$services.localization.render('platform.wiki.users.invitation.reject.label')"
class='button'/&gt;
&lt;a href="$backUrl" class='button secondary'&gt;
{{translation key="platform.wiki.users.invitation.postpone.label"/}}
&lt;/a&gt;
&lt;/span&gt;
&lt;input type="hidden" name="wikiId" value="$!escapetool.xml($wikiId)" /&gt;
&lt;input type="hidden" name="form_token" value="$!escapetool.xml($services.csrf.getToken())" /&gt;
&lt;/dd&gt;
&lt;/dl&gt;
&lt;/form&gt;
{{/html}}
......@@ -228,25 +236,33 @@
{{/warning}}
#end
{{html wiki='true'}}
$services.localization.render('platform.wiki.users.join.request.hint', [$wikiMainPageLinkStart, $wikiName, $wikiMainPageLinkEnd])
$services.localization.render('platform.wiki.users.join.request.hint', [$wikiMainPageLinkStart, $wikiName, $wikiMainPageLinkEnd])
&lt;form class='xform third' method='GET'&gt;
&lt;form class='xform third' method='GET'&gt;
&lt;dl&gt;
&lt;dt&gt;
&lt;label for='userComment'&gt;{{translation key="platform.wiki.users.join.request.message.label"/}}&lt;/label&gt;
&lt;span class='xHint'&gt;{{translation key="platform.wiki.users.join.request.message.hint"/}}&lt;/span&gt;
&lt;/dt&gt;
&lt;dd&gt;&lt;textarea name='userComment' rows='7' cols='45'&gt;&lt;/textarea&gt;&lt;/dd&gt;
&lt;span class='buttonwrapper'&gt;
&lt;dd&gt;
&lt;textarea name='userComment' rows='7' cols='45'&gt;&lt;/textarea&gt;
&lt;/dd&gt;
&lt;dd&gt;
&lt;span class='buttonwrapper'&gt;
&lt;br/&gt;
&lt;input type='submit' name='submit' value="$services.localization.render('platform.wiki.users.join.request.send.label')" class='button'/&gt;
&lt;a href="$backUrl" class='button secondary'&gt;{{translation key="platform.wiki.users.join.request.cancel.label"/}}&lt;/a&gt;
&lt;/span&gt;
&lt;input type='hidden' name='wikiId' value="$!wikiId"/&gt;
&lt;input type='hidden' name='requestJoin' value="$escapetool.xml($!request.requestJoin)"/&gt;
&lt;input type="hidden" name="form_token" value="$!escapetool.xml($services.csrf.getToken())" /&gt;
&lt;input type='submit' name='submit'
value="$services.localization.render('platform.wiki.users.join.request.send.label')"
class='button'/&gt;
&lt;a href="$backUrl" class='button secondary'&gt;
{{translation key="platform.wiki.users.join.request.cancel.label"/}}
&lt;/a&gt;
&lt;/span&gt;
&lt;input type='hidden' name='wikiId' value="$!wikiId"/&gt;
&lt;input type='hidden' name='requestJoin' value="$escapetool.xml($!request.requestJoin)"/&gt;
&lt;input type="hidden" name="form_token" value="$!escapetool.xml($services.csrf.getToken())" /&gt;
&lt;/dd&gt;
&lt;/dl&gt;
&lt;/form&gt;
{{/html}}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment