Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/layouts/FluxDefault.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/layouts/FluxDefault.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/layouts/FluxDefault.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/layouts/FluxDefault.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,30 @@ +<table class="w3-table"> + <tr> + <td colspan="2" align="left"> + $navigation.setTemplate("/FluxTop.vm") + </td> + </tr> + <tr> + <td colspan="2"> + <hr noshade size="1"> + </td> + </tr> + <tr> + <td width="10%" valign="top" align="left"> + $navigation.setTemplate("/FluxMenu.vm") + </td> + <td width="*" valign="center"> + $screen_placeholder + </td> + </tr> + <tr> + <td colspan="2"> + <hr noshade size="1"> + </td> + </tr> + <tr> + <td colspan="2"> + $navigation.setTemplate("/FluxBottom.vm") + </td> + </tr> +</table>
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/macros/fluxMacros.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/macros/fluxMacros.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/macros/fluxMacros.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/macros/fluxMacros.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,151 @@ +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "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. + +## +## $Id: TurbineMacros.vm 222027 2016-10-20 16:11:37Z painter $ +## +## Put your Application macros in this file. +## + +#* ------------------------------------------------------------------ +# Global Macros +*# ------------------------------------------------------------------ + +#* ------------------------------------------------------------------ +# Drop down select option for yes/no questions +*# ------------------------------------------------------------------ +#macro (selectYesNo $label $selection) + <select name="$label"> + #if ( $selection == "true" ) + <option value="1" selected>Yes</option> + <option value="0">No</option> + #else + <option value="1">Yes</option> + <option value="0" selected>No</option> + #end + </select> +#end + + +#* ------------------------------------------------------------------ +# Standard action form controls - Using w3.css styling +*# ------------------------------------------------------------------ + +#macro (insert) + <input type="submit" name="eventSubmit_doInsert" value="Insert"/> +#end + +#macro (save) + <input type="submit" name="eventSubmit_doUpdate" value="Update"/> +#end + +#macro (remove) + <input type="submit" name="eventSubmit_doDelete" value="Remove"/> +#end + + +#macro (warning $msg) +<div class="w3-panel w3-orange w3-card-8"> + $msg +</div> +#end + +#macro (error $msg) +<div class="w3-panel w3-red w3-card-8"> + $msg +</div> +#end + +#macro(info $msg) +<div class="w3-panel w3-blue w3-card-8"> + $msg +</div> +#end + + +#* ------------------------------------------------------------------ +# +# Macros that are used for displaying input forms. Using w3.css styling +# +*# ------------------------------------------------------------------ + +#macro (formLabel $label) + <label>$!label</label> +#end + +#macro (fileUpload $label $name) + <label>$!label</label> + <input class="w3-input" type="file" name="$!name"> +#end + +#macro (formCheckBox $label $name $checked) + #formLabel( $label ) + #checkBox( $name $checked ) +#end + +#macro (checkBox $name $checked) + <input id="$!name" class="w3-check" type="checkbox" checked="$!checked"> +#end + +#macro (formLabelRequired $label) + <label class="w3-label w3-validate">$!label</label> +#end + +#macro (formTextField $name $value) + <input class="w3-input" type="text" name="$!name" value="$!value"> +#end + +#macro (smallFormTextField $name $value) + <input class="w3-input" type="text" name="$!name" value="$!value"> +#end + +#macro (textField $name $value) + <input class="w3-input" type="text" name="$!name" value="$!value"> +#end + +#macro (textareaField $label $name $value) + <p> + <label class="w3-label">$label</label> + <textarea class="w3-input" style="width:90%" rows="6" name="$name" required>$!value</textarea> + </p> + +#end + +#macro (formPasswordCell $label $name $value) + <p> + #formLabel( $label ) + <input class="w3-input" type="password" name="$!name" value="$!value"> + </p> +#end + +#macro (formCellRequired $label $name $value) + <p> + #formLabelRequired($label) + #formTextField($name $value) + </p> +#end + +#macro (formCell $label $name $value) + #formLabel($label) + #formTextField($name $value) +#end + +#macro (smallFormCell $label $name $value) + #formLabel($label) + #smallFormTextField($name $value) +#end + Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxBottom.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxBottom.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxBottom.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxBottom.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,2 @@ +<font face="verdana,geneva,helvetica"> +</font> Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxMenu.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxMenu.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxMenu.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxMenu.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,16 @@ +## ----------------------------------------------------------------------- +## Menu.vm +## +## Main menu for the Turbine administration application. +## ----------------------------------------------------------------------- +<font size="-1" face="$ui.sansSerifFonts"> + <a href="$link.setPage("user,FluxUserList.vm")">Users</a> + <br> + <a href="$link.setPage("group,FluxGroupList.vm")">Groups</a> + <br> + <a href="$link.setPage("role,FluxRoleList.vm")">Roles</a> + <br> + <a href="$link.setPage("permission,FluxPermissionList.vm")">Permissions</a> + <p> + <a href="$link.setAction("FluxLogout").setPage("FluxLogin.vm")">Logout</a> +</font> Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxTop.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxTop.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxTop.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/navigations/FluxTop.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,3 @@ +<img src="$ui.image($ui.logo)"> +<font face="verdana,geneva,helvetica"> +</font> Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxEmbeddedMenu.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxEmbeddedMenu.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxEmbeddedMenu.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxEmbeddedMenu.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,12 @@ +## ----------------------------------------------------------------------- +## Menu.vm +## +## Main menu for the Turbine administration application. +## ----------------------------------------------------------------------- +<div class="w3-container"> + <a href="$link.setPage("user,FluxUserList.vm")" class="w3-btn w3-round w3-white w3-border w3-border-blue">Users</a> + <a href="$link.setPage("group,FluxGroupList.vm")" class="w3-btn w3-round w3-white w3-border w3-border-blue">Groups</a> + <a href="$link.setPage("role,FluxRoleList.vm")" class="w3-btn w3-round w3-white w3-border w3-border-blue">Roles</a> + <a href="$link.setPage("permission,FluxPermissionList.vm")" class="w3-btn w3-round w3-white w3-border w3-border-blue">Permissions</a> +</div> + Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxError.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxError.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxError.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxError.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,26 @@ +#** + +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxError.vm,v 1.1.1.1 2003-06-19 23:07:21 painter Exp $ + +*# + +$page.setBgColor($ui.bgcolor) +$page.setTitle("") + +<font face="$ui.sansSerifFonts"> + +The reason for the error was: +<p> +<pre> +$processingException + +</pre> + +<P> +The stacktrace is as follows: +<pre> +$stackTrace +</pre> + +</font> Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxIndex.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxIndex.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxIndex.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxIndex.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,15 @@ +#** + +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxIndex.vm,v 1.1.1.1 2003-06-19 23:07:21 painter Exp $ + +*# + +$page.setBgColor($ui.bgcolor) +$page.setTitle("Home Page") + +<font face="$ui.sansSerifFonts"> + +This is the administration application. + +</font> Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxLogin.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxLogin.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxLogin.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/FluxLogin.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,28 @@ +#** + +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxLogin.vm,v 1.1.1.1 2003-06-19 23:07:21 painter Exp $ + +*# + +$page.setTitle("Please Login") +$page.setBgColor($ui.bgcolor) + +<form method="post" action="$link.setAction("FluxLogin").setPage("FluxIndex.vm")"> + <table> + <tr> + #formCell ("User" "username" "") + </tr> + <tr> + #formPasswordCell ("Password" "password" "") + </tr> + <tr> + <td> + <font face="$ui.sansSerifFonts"> + <input type="submit" value="Login"> + </font> + </td> + </tr> + </table> +</form> + Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupAlreadyExists.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupAlreadyExists.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupAlreadyExists.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupAlreadyExists.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,13 @@ +#** + +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@version $Id: FluxGroupAlreadyExists.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + +<div class="w3-panel w3-red"> +The group name <b>$name</b> is currently is use. Group names +must be unique, please choose another group name. +</div> + Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupForm.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupForm.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupForm.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupForm.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,50 @@ +#** + +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxGroupForm.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + + +#if ($errorTemplate) + #parse ($errorTemplate) +#end + + +<form + method="post" + action="$link.setPage("group,FluxGroupList.vm").setAction("group.FluxGroupAction")"> + + <table class="w3-table w3-striped w3-bordered"> + <tr> + #formCell ("Group Name" "group" $!flux.Group.Name) + </tr> + </table> + + #* + Check for a mode, the update and delete buttons + shouldn't appear when inserting a new user. + *# + + #if ($flux.Mode == "modify") + <input type="hidden" name="oldName" value="$!flux.Group.Name"> + <div class="w3-container w3-padding w3-center"> + <input class="w3-btn w3-blue w3-round" style="width: 180px;" type="submit" name="eventSubmit_doUpdate" value="Update Group"/> + </div> + #elseif ($flux.Mode == "delete") + <div class="w3-container w3-padding w3-center"> + <input class="w3-btn w3-blue w3-round" style="width: 180px;" type="submit" name="eventSubmit_doDelete" value="Confirm Deletion"/> + </div> + #else + <div class="w3-container w3-padding w3-center"> + <input class="w3-btn w3-blue w3-round" style="width: 180px;" type="submit" name="eventSubmit_doInsert" value="Add Group"/> + </div> + #end + +</form> + +#if ($showEmbeddedMenu) + <hr size="1" noshade> + #parse ("screens/FluxEmbeddedMenu.vm") +#end Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupList.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupList.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupList.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/group/FluxGroupList.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,43 @@ +#** + +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxGroupList.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + +$page.setTitle("Group Adminstration") +$page.setBgColor($ui.bgcolor) + +#set ( $headings = ["Group Name"] ) + +<div class="w3-container w3-padding"> <h2>Current Groups</h2> </div> + +<table class="w3-table w3-striped w3-bordered"> + <tr> + #foreach ($heading in $headings) + <th>$heading</th> + #end + </tr> + + #foreach ($group in $flux.Groups) + <tr> + <td>$group.Name</td> + <td> + <a href="$link.setPage("group,FluxGroupForm.vm").addPathInfo("group",$group.Name).addQueryData("mode","modify")">Details</a> + <a href="$link.setPage("group,FluxGroupForm.vm").addPathInfo("group",$group.Name).addQueryData("mode","delete")">Remove</a> + </td> + </tr> + #end +</table> + + +<div class="w3-container w3-padding w3-center"> + <a class="w3-btn w3-blue w3-round" style="width: 180px;" + href="$link.setPage("group,FluxGroupForm.vm").addQueryData("mode","insert")">Add Group</a> +</div> + +#if ($showEmbeddedMenu) + <hr size="1" noshade> + #parse ("screens/FluxEmbeddedMenu.vm") +#end Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionAlreadyExists.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionAlreadyExists.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionAlreadyExists.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionAlreadyExists.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,11 @@ +#** + +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxPermissionAlreadyExists.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + +<div class="w3-panel w3-red"> +The permission name <b>$name</b> is currently is use. Permission +names must be unique, please choose another name. +</div> \ No newline at end of file Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionForm.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionForm.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionForm.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionForm.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,48 @@ +#** + +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxPermissionForm.vm,v 1.1.1.1 2003-06-19 23:07:21 painter Exp $ + +*# + +#if ($errorTemplate) + #parse ($errorTemplate) +#end + +<form + method="post" + action="$link.setPage("permission,FluxPermissionList.vm").setAction("permission.FluxPermissionAction")"> + + <table class="w3-table w3-striped w3-bordered"> + <tr> + #formCell ("Permission Name" "permission" $!flux.Permission.Name) + </tr> + </table> + + + #* + Check for a mode, the update and delete buttons + shouldn't appear when inserting a new user. + *# + + #if ($flux.Mode == "modify") + <input type="hidden" name="oldName" value="$!flux.Permission.Name"> + <div class="w3-container w3-padding w3-center"> + <input class="w3-btn w3-blue w3-round" style="width: 180px;" type="submit" name="eventSubmit_doUpdate" value="Update Permission"/> + </div> + #elseif ($flux.Mode == "delete") + <div class="w3-container w3-padding w3-center"> + <input class="w3-btn w3-blue w3-round" style="width: 180px;" type="submit" name="eventSubmit_doDelete" value="Confirm Deletion"/> + </div> + #else + <div class="w3-container w3-padding w3-center"> + <input class="w3-btn w3-blue w3-round" style="width: 180px;" type="submit" name="eventSubmit_doInsert" value="Add Permission"/> + </div> + #end + +</form> + +#if ($showEmbeddedMenu) + <hr size="1" noshade> + #parse ("screens/FluxEmbeddedMenu.vm") +#end Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionList.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionList.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionList.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxPermissionList.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,42 @@ +#** + +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxPermissionList.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + +## Load permissions +#set ( $permissions = $flux.Permissions ) + +<h2>All Permissions</h2> + +#set ( $headings = ["Permission Name"] ) + +<table class="w3-table w3-bordered"> + <tr> + #foreach ($heading in $headings) + <th>$heading</th> + #end + </tr> + + #foreach ($permission in $permissions ) + <tr> + <td> $permission.Name </td> + <td> + <a href="$link.setPage("permission,FluxPermissionForm.vm").addPathInfo("permission",$permission.Name).addQueryData("mode","modify")">Details</a> + <a href="$link.setPage("permission,FluxPermissionForm.vm").addPathInfo("permission",$permission.Name).addQueryData("mode","delete")">Remove</a> + </td> + </tr> + #end +</table> + +<div class="w3-container w3-padding w3-center"> + <a class="w3-btn w3-blue w3-round" style="width: 180px;" + href="$link.setPage("permission,FluxPermissionForm.vm").addQueryData("mode","insert")">Add New Permission</a> +</div> + +#if ($showEmbeddedMenu) + <hr size="1" noshade> + #parse ("screens/FluxEmbeddedMenu.vm") +#end Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxRolePermissionList.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxRolePermissionList.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxRolePermissionList.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/permission/FluxRolePermissionList.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,56 @@ +#** + +This template is used to display the permissions +for a role. + +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxRolePermissionForm.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + +#set ( $role = $flux.Role ) + +## Load permissions +#set ( $permissions = $flux.Permissions ) +<h2>Permissions for the $role.Name role</h2> + +<form method="post" action="$link.setAction("role.FluxRoleAction").setPage("role,FluxRoleList.vm")"> + + <input type="hidden" name="role" value="$role.Name"> + + <table class="w3-table w3-bordered"> + <tr> + <th> Permission </th> + <th> Assign to Role </th> + </tr> + + #foreach ($permission in $permissions) + <tr> + <td align="right"> <b>$!permission.Name</b> </td> + <td align="center"> + #if ($role.Permissions.contains($permission)) + #set ($checked = "checked") + #else + #set ($checked = "") + #end + <input type="checkbox" name="${role.Name}${permission.Name}" $checked> + </td> + </tr> + #end + + <tr> + <td> + <input class="w3-button w3-blue" type="submit" name="eventSubmit_doPermissions" value="Update Permissions"> + </td> + </tr> + </table> + +</form> + +#if ($showEmbeddedMenu) + <hr size="1" noshade> + #parse ("screens/FluxEmbeddedMenu.vm") +#end + + Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleAlreadyExists.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleAlreadyExists.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleAlreadyExists.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleAlreadyExists.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,16 @@ +#** + +Display this template when the administrator +tries to add a user with a role that is +already being used by the security system. + +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxRoleAlreadyExists.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + +<div class="w3-panel w3-red"> +The role name <b>$name</b> is currently in use. Role names +must be unique, please choose another role name. +</div> + Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleForm.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleForm.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleForm.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleForm.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,51 @@ +#** + +This template is used to display the details of +a role. + +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxRoleForm.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + +#if ($errorTemplate) + #parse ($errorTemplate) +#end + +<form + method="post" + action="$link.setPage("role,FluxRoleList.vm").setAction("role.FluxRoleAction")"> + + <table class="w3-table w3-striped w3-bordered"> + <tr> + #formCell ("Role Name" "role" $!flux.Role.Name) + </tr> + </table> + + #* + Check for a mode, the update and delete buttons + shouldn't appear when inserting a new user. + *# + + #if ($flux.Mode == "modify") + <input type="hidden" name="oldName" value="$!flux.Role.Name"> + <div class="w3-container w3-padding w3-center"> + <input class="w3-btn w3-blue w3-round" style="width: 180px;" type="submit" name="eventSubmit_doUpdate" value="Update Role"/> + </div> + #elseif ($flux.Mode == "delete") + <div class="w3-container w3-padding w3-center"> + <input class="w3-btn w3-blue w3-round" style="width: 180px;" type="submit" name="eventSubmit_doDelete" value="Confirm Deletion"/> + </div> + #else + <div class="w3-container w3-padding w3-center"> + <input class="w3-btn w3-blue w3-round" style="width: 180px;" type="submit" name="eventSubmit_doInsert" value="Add Role"/> + </div> + #end + +</form> + +#if ($showEmbeddedMenu) + <hr size="1" noshade> + #parse ("screens/FluxEmbeddedMenu.vm") +#end Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleList.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleList.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleList.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/role/FluxRoleList.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,42 @@ +#** + +Used to display the roles currently being used in +the application. + +*# +#set ( $headings = ["Role Name"] ) + +<div class="w3-container w3-padding"> <h2>Current Roles</h2> </div> + +<table class="w3-table w3-striped w3-bordered"> + <tr> + #foreach ($heading in $headings) + <th>$heading</th> + #end + </tr> + + #foreach ($role in $flux.Roles) + #if ( $role.Name != "super_admin" ) + <tr> + <td> $role.Name </td> + <td> + <a href="$link.setPage("permission,FluxRolePermissionList.vm").addPathInfo("role",$role.Name)">Permissions</a> + <a href="$link.setPage("role,FluxRoleForm.vm").addPathInfo("role",$role.Name).addQueryData("mode","modify")">Details</a> + <a href="$link.setPage("role,FluxRoleForm.vm").addPathInfo("role",$role.Name).addQueryData("mode","delete")">Remove</a> + </td> + </tr> + #end + #end + +</table> + + <div class="w3-container w3-padding w3-center"> + <a class="w3-btn w3-blue w3-round" style="width: 180px;" + href="$link.setPage("role,FluxRoleForm.vm").addQueryData("mode","insert")">Add New Role</a> + </div> + + +#if ($showEmbeddedMenu) + <hr size="1" noshade> + #parse ("screens/FluxEmbeddedMenu.vm") +#end Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxMissingRequiredInputs.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxMissingRequiredInputs.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxMissingRequiredInputs.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxMissingRequiredInputs.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,15 @@ +#* +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@version $Id: FluxMissingRequiredInputs.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ +*# + +<div class="w3-panel w3-red"> +The following fields are required and must be entered before +this request can be processed: +<ul> +#foreach ($missingRequiredInput in $missingRequiredInputs) + <li>$missingRequiredInput</li> +#end +</ul> +</div> \ No newline at end of file Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserAlreadyExists.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserAlreadyExists.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserAlreadyExists.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserAlreadyExists.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,13 @@ +#* + +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@version $Id: FluxUserAlreadyExists.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + +<div class="w3-panel w3-red"> +The username <b>$username</b> is currently is use. Usernames +must be unique for all users, please choose another username. +</div> + Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserForm.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserForm.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserForm.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserForm.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,66 @@ +#** + +Display the details of a user. + +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@version $Id: FluxUserForm.vm,v 1.10 2017-11-17 19:21:40 painter Exp $ + +*# + +<!-- Primary edit screen --> +<form + name="user" + method="post" + action="$link.setAction("user.FluxUserAction").setPage("user,FluxUserList.vm")"> + + #set ( $user = $flux.User ) + + <div class="w3-container w3-padding w3-gray"> + + <div class="w3-row-padding"> + + <!-- User Info --> + <div class="w3-half"> + <div class="w3-card-8 w3-padding w3-white"> + <div id="newUser" style="display: block;"> + <h2>User Details</h2> + #formCell( "Username" "username" $!user.Name ) + #formCell( "First Name" "firstName" $!user.FirstName ) + #formCell( "Last Name" "lastName" $!user.LastName ) + #formCell( "Email" "email" $!user.Email ) + </div> + </div> + </div> + <div class="w3-half"> + <div id="userPassword" class="w3-card-8 w3-padding w3-white"> + <h2>Password</h2> + + <p> + Password required for user to login. If you are just + updating a user's details, leave the password field + blank, otherwise, new password will be set + + #formPasswordCell( "New Password" "password" "" ) + + </div> + </div> + </div> + </div> + <p> + #if ($flux.Mode == "modify") + <input type="submit" name="eventSubmit_doUpdate" value="Update User"> + #elseif ($flux.Mode == "delete") + <input type="submit" name="eventSubmit_doDelete" value="Delete User"> + #else + <input type="submit" name="eventSubmit_doInsert" value="Add User"> + #end + + <p> + + #if ($showEmbeddedMenu) + <hr size="1" noshade> + #parse ("screens/FluxEmbeddedMenu.vm") + #end + +</form> Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserList.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserList.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserList.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserList.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,38 @@ +#set ( $headings = ["Username","First Name", "Last Name", "Email", "Admin" ] ) + + +<div class="w3-container w3-padding"> <h2>Current Users</h2> </div> + +<table class="w3-table w3-striped w3-bordered"> + <tr> + #foreach ($heading in $headings) + <th>$heading</th> + #end + </tr> + + #foreach ($user in $flux.getUsers() ) + <tr> + <td>$!user.Name</td> + <td>$!user.FirstName</td> + <td>$!user.LastName</td> + <td><a href=mailto:$!user.Email>$!user.Email</a></td> + <td><a href="$link.setPage("user,FluxUserForm.vm").addQueryData("username","$user.Name").addQueryData("mode","modify")">Details</a> + <a href="$link.setPage("user,FluxUserRoleForm.vm").addQueryData("username","$user.Name").addQueryData("mode","modify")">Roles</a> + <a href="$link.setPage("user,FluxUserForm.vm").addQueryData("username","$user.Name").addQueryData("mode","delete")">Remove</a> + </td> + </tr> + #end + +</table> +<p> + <div class="w3-container w3-padding w3-center"> + <a class="w3-btn w3-blue w3-round" style="width: 180px;" + href="$link.setPage("user,FluxUserForm.vm").addQueryData("mode","insert")">Add + New User</a> + </div> + +#if ($showEmbeddedMenu) + <hr size="1" noshade> + #parse ("screens/FluxEmbeddedMenu.vm") +#end + \ No newline at end of file Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserRoleForm.vm URL: http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserRoleForm.vm?rev=1821946&view=auto ============================================================================== --- turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserRoleForm.vm (added) +++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/flux/screens/user/FluxUserRoleForm.vm Mon Jan 22 21:42:49 2018 @@ -0,0 +1,63 @@ +#** + +@author <a href="mailto:jvan...@periapt.com";>Jason van Zyl</a> +@author <a href="mailto:j...@jivecast.com";>Jeffery Painter</a> +@version $Id: FluxUserRoleForm.vm,v 1.1.1.1 2017-11-26 23:07:21 painter Exp $ + +*# + +#set ($user = $flux.User) +#set ($acl = $flux.ACL) + +<h2>Roles for $user.FirstName $user.LastName</h2> + +<form method="post" action="$link.setAction("user.FluxUserAction").setPage("user,FluxUserList.vm")"> + +<input type="hidden" name="username" value="$user.Name"> +<table class="w3-table w3-bordered"> + <tr> + <th> </th> + + #foreach ($role in $flux.Roles) + #if ( $role.Name != "super_admin" ) + <th> + <b>$role.Name</b> + </th> + #end + #end + + </tr> + + + #foreach ($group in $flux.Groups) + <tr> + <td> + <b>$group.Name</b> + </td> + + #foreach ($role in $flux.Roles) + #if ( $role.Name != "super_admin" ) + #if ($acl.hasRole($role, $group)) + #set ($checked = "checked") + #else + #set ($checked = "") + #end + + <td align="center"> + <input type="checkbox" class="w3-checkbox" name="${group.Name}${role.Name}" $checked> + </td> + #end + #end + + </tr> + #end + + <tr> + <td> + <input type="submit" name="eventSubmit_doRoles" value="Update Roles"> + </td> + </tr> + +</table> + +</form>
