branch develop updated (fda2e5d -> 1656139)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from fda2e5d remove bad bad bad console.log new e799665 Update display of document edit modal to fit with document edit page new 1656139 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1656139e8d8bf7a12d3e71be853f2863e42557bb Merge: e799665 fda2e5d Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Feb 13 10:57:43 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit e799665c14efc05a43e1f2314314ac73fa005cd3 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Feb 13 10:57:20 2015 +0100 Update display of document edit modal to fit with document edit page Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 3 + .../webapp/views/documents/modalDocumentEdit.html | 136 +++++++++++---------- 2 files changed, 72 insertions(+), 67 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit e799665c14efc05a43e1f2314314ac73fa005cd3 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Feb 13 10:57:20 2015 +0100 Update display of document edit modal to fit with document edit page --- coselmar-ui/src/main/webapp/css/coselmar.css | 3 + .../webapp/views/documents/modalDocumentEdit.html | 136 +++++++++++---------- 2 files changed, 72 insertions(+), 67 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 97be91b..f43e553 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -134,6 +134,9 @@ a { .paddingLeft10 { padding-left: 10px; } +.paddingLeft20 { + padding-left: 20px; +} /* Titles -------------------------------------------------- */ diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index 7697cae..8b30580 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -23,8 +23,8 @@ --> <div xmlns="http://www.w3.org/1999/html"> <div class="modal-title"> - <h2>{{ 'document.create.title' | translate }}</h2> - <span translate="common.message.mandatoryFieldsInfo"></span> + <h2 class="paddingLeft20">{{ 'document.create.title' | translate }}</h2> + <span translate="common.message.mandatoryFieldsInfo" class="marginLeft20"></span> </div> <form class="form-horizontal" name="documentForm" role="form" @@ -33,7 +33,7 @@ <div class="modal-body"> - <!-- Line with Name and Type --> + <!-- Line with Name and Authors --> <div class="form-group row"> <div class="" @@ -51,6 +51,26 @@ </div> <div class="" + ng-class="{'has-error' : documentForm.authors.$invalid && !documentForm.authors.$pristine}"> + <label class="col-md-2 control-label">{{ 'document.metadata.authors' | translate }} *</label> + + <div class="col-md-4"> + <input type="text" class="form-control" name="authors" + placeholder="Name Firstname" + ng-model="document.authors" required/> + + <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" + class="help-block">{{ 'document.message.requiredAuthors' | translate }}</p> + </div> + </div> + + </div> + <!-- End Line with name and authors --> + + <!-- Line with Type and privacy --> + <div class="form-group row"> + + <div class="" ng-class="{'has-error' : documentForm.type.$invalid && !documentForm.type.$pristine}"> <label class="col-md-2 control-label">{{ 'document.metadata.type' | translate }} *</label> @@ -79,8 +99,23 @@ <option data-ng-repeat="type in modalExisting.types" value="{{type}}"> </datalist> </div> + + <div class=""> + <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }}</label> + + <div class="col-md-4"> + <select class="form-control" name="privacy" + ng-model="document.privacy"> + <option value="PRIVATE">{{ 'common.privacy.private' | translate }}</option> + <option value="PUBLIC">{{ 'common.privacy.public' | translate }}</option> + <option value="RESTRICTED">{{ 'document.privacy.questionRestricted' | translate }}</option> + </select> + + </div> + + </div> </div> - <!-- End Line with name and Type --> + <!-- End Line with Type and privacy --> <!-- Line with file and externalURL --> <div class="form-group" @@ -150,56 +185,50 @@ </div> <!-- End Line with keywords --> - <!-- Line with Publication Date and privacy --> + <!-- Line with Copyright and Licence --> <div class="form-group"> - <div class=""> - <label class="col-md-2 control-label">{{ 'document.metadata.publicationDate' | translate }}</label> + <div + ng-class="{'has-error' : documentForm.copyright.$invalid && !documentForm.copyright.$pristine}"> + <label class="col-md-2 control-label">{{ 'document.metadata.copyright' | translate }} *</label> <div class="col-md-4"> - <div class="input-group"> - <input type="text" class="form-control" name="publicationDate" - placeholder="dd/MM/yyyy" - ng-model="document.publicationDate" - datepicker-popup="dd/MM/yyyy" - is-open="publicationDateOpened" - ng-click="publicationDateOpened = true"/> - <span class="input-group-addon"><span class="fa fa-calendar" - aria-hidden="true"></span></span> - </div> + <input type="text" class="form-control" name="copyright" + placeholder="Copyright owner" + ng-model="document.copyright" required/> + + <p ng-show="documentForm.copyright.$invalid && !documentForm.copyright.$pristine" + class="help-block">{{ 'document.message.requiredCopyright' | translate }}</p> </div> </div> <div class=""> - <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }}</label> + <label class="col-md-2 control-label">{{ 'document.metadata.licence' | translate }}</label> <div class="col-md-4"> - <select class="form-control" name="privacy" - ng-model="document.privacy"> - <option value="PRIVATE">{{ 'common.privacy.private' | translate }}</option> - <option value="PUBLIC">{{ 'common.privacy.public' | translate }}</option> - <option value="RESTRICTED">{{ 'document.privacy.questionRestricted' | translate }}</option> - </select> - + <input type="text" class="form-control" name="licence" + placeholder="License of document" + ng-model="document.licence"/> </div> - </div> </div> - <!-- End Line with publication Date and privacy --> + <!-- End Line with Copyright and Licence --> - <!-- Line with Authors and Language --> + <!-- Line with Publication Date and Language --> <div class="form-group"> + <div class=""> + <label class="col-md-2 control-label">{{ 'document.metadata.publicationDate' | translate }}</label> - <div class="" - ng-class="{'has-error' : documentForm.authors.$invalid && !documentForm.authors.$pristine}"> - <label class="col-md-2 control-label">{{ 'document.metadata.authors' | translate }} *</label> - - <div class="col-md-5"> - <input type="text" class="form-control" name="authors" - placeholder="Name Firstname" - ng-model="document.authors" required/> - - <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" - class="help-block">{{ 'document.message.requiredAuthors' | translate }}</p> + <div class="col-md-4"> + <div class="input-group"> + <input type="text" class="form-control" name="publicationDate" + placeholder="dd/MM/yyyy" + ng-model="document.publicationDate" + datepicker-popup="dd/MM/yyyy" + is-open="publicationDateOpened" + ng-click="publicationDateOpened = true"/> + <span class="input-group-addon"><span class="fa fa-calendar" + aria-hidden="true"></span></span> + </div> </div> </div> @@ -212,36 +241,9 @@ ng-model="document.language"/> </div> </div> - </div> - <!-- End Line with publication Date, Authors and Language --> - - <!-- Line with Copyright and Licence --> - <div class="form-group"> - <div - ng-class="{'has-error' : documentForm.copyright.$invalid && !documentForm.copyright.$pristine}"> - <label class="col-md-2 control-label">{{ 'document.metadata.copyright' | translate }} *</label> - - <div class="col-md-4"> - <input type="text" class="form-control" name="copyright" - placeholder="Copyright owner" - ng-model="document.copyright" required/> - <p ng-show="documentForm.copyright.$invalid && !documentForm.copyright.$pristine" - class="help-block">{{ 'document.message.requiredCopyright' | translate }}</p> - </div> - </div> - - <div class="form-group"> - <label class="col-md-2 control-label">{{ 'document.metadata.licence' | translate }}</label> - - <div class="col-md-4"> - <input type="text" class="form-control" name="licence" - placeholder="License of document" - ng-model="document.licence"/> - </div> - </div> </div> - <!-- End Line with Copyright and Licence --> + <!-- End Line with publication Date and language --> <!-- Line with Summary --> <div class="form-group" -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 1656139e8d8bf7a12d3e71be853f2863e42557bb Merge: e799665 fda2e5d Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Feb 13 10:57:43 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 -- 1 file changed, 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm