This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 80125fa5b1859471ad057c64a82ac27fd6c430c7 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Thu May 28 16:19:32 2015 +0200 Move the buttons for the actions on the repository on the edit page to the header --- .../src/main/webapp/WEB-INF/content/browse.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 103 +++++++++++---------- swe-ui-web/src/main/webapp/css/main.css | 24 ++++- 3 files changed, 73 insertions(+), 56 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp index 713b01b..5360bbc 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp @@ -168,7 +168,7 @@ <s:set name="address"> <s:property value="address"/> </s:set> - <center> + <center id="repositoryButtonsBrowse"> <s:submit name="uploadButton" value="%{scm.upload}" title="%{scm.uploadTitle}" onClick="javascript:open_popup('doUpload.action', 'upload' , scmAddress, '%{scmType}' );"/> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index 33ec043..4218ecc 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -231,9 +231,6 @@ <s:submit id="openAnotherFile" value="%{openAnotherFile}" onclick="openPopin('openFilePopin'); return false;"/> - -<!-- authentication --> - <div id="buttonList"> <!--BEGIN Save and continue --> @@ -330,6 +327,59 @@ </div> + <!-- Buttons for the actions on the repository --> + + <s:set id="scm.upload"> + <s:text name="scm.upload"/> + </s:set> + <s:set id="scm.uploadTitle"> + <s:text name="scm.uploadTitle"/> + </s:set> + + <s:set id="scm.removeFile"> + <s:text name="scm.removeFile"/> + </s:set> + <s:set id="scm.removeFileTitle"> + <s:text name="scm.removeFileTitle"/> + </s:set> + + <s:set id="scm.createDirectory"> + <s:text name="scm.createDirectory"/> + </s:set> + <s:set id="scm.createDirectoryTitle"> + <s:text name="scm.createDirectoryTitle"/> + </s:set> + + <s:set id="scm.removeDirectory"> + <s:text name="scm.removeDirectory"/> + </s:set> + <s:set id="scm.removeDirectoryTitle"> + <s:text name="scm.removeDirectoryTitle"/> + </s:set> + + <s:set name="address"> + <s:property value="address"/> + </s:set> + + <ul id="repositoryButtons"> + <li> + <s:submit name="uploadButton" value="%{scm.upload}" title="%{scm.uploadTitle}" + onClick="javascript:open_popup('doUpload.action', 'upload', getElementById('address').value, '%{scmType}');"/> + </li> + <li> + <s:submit name="removeButton" value="%{scm.removeFile}" title="%{scm.removeFileTitle}" + onClick="javascript:open_popup('doRemove.action', 'remove', getElementById('address').value, '%{scmType}');"/> + </li> + <li> + <s:submit name="createDirectoryButton" value="%{scm.createDirectory}" title="%{scm.createDirectoryTitle}" + onClick="javascript:open_popup('doCreateDirectory.action', 'create directory',getElementById('address').value,'%{scmType}');"/> + </li> + <li> + <s:submit name="removeDirectoryButton" value="%{scm.removeDirectory}" title="%{scm.removeDirectoryTitle}" + onClick="javascript:open_popup('doRemoveDirectory.action', 'remove directory',getElementById('address').value,'%{scmType}');"/> + </li> + </ul> + </div> <div id="editBody"> @@ -437,53 +487,6 @@ </div> </form> - <s:set id="scm.upload"> - <s:text name="scm.upload"/> - </s:set> - <s:set id="scm.uploadTitle"> - <s:text name="scm.uploadTitle"/> - </s:set> - - <s:set id="scm.removeFile"> - <s:text name="scm.removeFile"/> - </s:set> - <s:set id="scm.removeFileTitle"> - <s:text name="scm.removeFileTitle"/> - </s:set> - - <s:set id="scm.createDirectory"> - <s:text name="scm.createDirectory"/> - </s:set> - <s:set id="scm.createDirectoryTitle"> - <s:text name="scm.createDirectoryTitle"/> - </s:set> - - <s:set id="scm.removeDirectory"> - <s:text name="scm.removeDirectory"/> - </s:set> - <s:set id="scm.removeDirectoryTitle"> - <s:text name="scm.removeDirectoryTitle"/> - </s:set> - - <s:set name="address"> - <s:property value="address"/> - </s:set> - - <center> - <s:submit name="uploadButton" value="%{scm.upload}" title="%{scm.uploadTitle}" - onClick="javascript:open_popup('doUpload.action', 'upload', getElementById('address').value, '%{scmType}');"/> - - <s:submit name="removeButton" value="%{scm.removeFile}" title="%{scm.removeFileTitle}" - onClick="javascript:open_popup('doRemove.action', 'remove', getElementById('address').value, '%{scmType}');"/> - - <s:submit name="createDirectoryButton" value="%{scm.createDirectory}" title="%{scm.createDirectoryTitle}" - onClick="javascript:open_popup('doCreateDirectory.action', 'create directory',getElementById('address').value,'%{scmType}');"/> - - <s:submit name="removeDirectoryButton" value="%{scm.removeDirectory}" title="%{scm.removeDirectoryTitle}" - onClick="javascript:open_popup('doRemoveDirectory.action', 'remove directory',getElementById('address').value,'%{scmType}');"/> - </center> - - <div id="targetContentUpload"></div> </div> diff --git a/swe-ui-web/src/main/webapp/css/main.css b/swe-ui-web/src/main/webapp/css/main.css index f3a1738..02680d7 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -129,20 +129,20 @@ ul.flags li { display: inline; } -#wwctrl_uploadButton { +#repositoryButtonsBrowse #wwctrl_uploadButton { margin-right: 1%; } -#wwctrl_removeButton, #wwctrl_createDirectoryButton { +#repositoryButtonsBrowse #wwctrl_removeButton, #repositoryButtonsBrowse #wwctrl_createDirectoryButton { margin-left: 1%; margin-right: 1%; } -#wwctrl_removeDirectoryButton { +#repositoryButtonsBrowse #wwctrl_removeDirectoryButton { margin-left: 1%; } -#wwgrp_username { +#repositoryButtonsBrowse #wwgrp_username { float:left; } @@ -231,7 +231,7 @@ ul.flags li { height:32px; position:relative; top:20px; - left: 75%; + left: 70%; } @@ -462,4 +462,18 @@ ul.flags li { #wwctrl_openAnotherFile { text-align: center; +} + +ul#repositoryButtons { + display: inline; + float: right; + text-align: right; + list-style: none; + position: relative; + bottom: 105px; + right: 5px; +} + +ul#repositoryButtons li { + margin-bottom: 5px; } \ No newline at end of file -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.