branch develop updated (78d419a -> 1f6f5c7)
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 78d419a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 1f6f5c7 fixes #6430 rename document owner to depositor to be more explicit, and add authors in listing The 1 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 1f6f5c78301c0764c5e90098dbd7cbdf4ea30a62 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 12 18:19:49 2015 +0100 fixes #6430 rename document owner to depositor to be more explicit, and add authors in listing Summary of changes: coselmar-ui/src/main/webapp/views/documents/document.html | 4 ++-- coselmar-ui/src/main/webapp/views/documents/documents.html | 6 ++++-- .../src/main/webapp/views/documents/modalDocumentSearch.html | 6 ++++-- .../src/main/webapp/views/questions/editquestion.html | 10 ++++++---- .../src/main/webapp/views/questions/newDocumentsPart.html | 6 ++++-- .../src/main/webapp/views/questions/viewquestion.html | 12 ++++++++---- 6 files changed, 28 insertions(+), 16 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 1f6f5c78301c0764c5e90098dbd7cbdf4ea30a62 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 12 18:19:49 2015 +0100 fixes #6430 rename document owner to depositor to be more explicit, and add authors in listing --- coselmar-ui/src/main/webapp/views/documents/document.html | 4 ++-- coselmar-ui/src/main/webapp/views/documents/documents.html | 6 ++++-- .../src/main/webapp/views/documents/modalDocumentSearch.html | 6 ++++-- .../src/main/webapp/views/questions/editquestion.html | 10 ++++++---- .../src/main/webapp/views/questions/newDocumentsPart.html | 6 ++++-- .../src/main/webapp/views/questions/viewquestion.html | 12 ++++++++---- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/documents/document.html b/coselmar-ui/src/main/webapp/views/documents/document.html index 959087c..7eae60a 100644 --- a/coselmar-ui/src/main/webapp/views/documents/document.html +++ b/coselmar-ui/src/main/webapp/views/documents/document.html @@ -35,7 +35,7 @@ <td>{{document.name}}</td> </tr> <tr> - <td>Owner</td> + <td>Depositor</td> <td>{{document.ownerName}}</td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>License</td> - <td>{{document.lincese}}</td> + <td>{{document.license}}</td> </tr> <tr> <td>Language</td> diff --git a/coselmar-ui/src/main/webapp/views/documents/documents.html b/coselmar-ui/src/main/webapp/views/documents/documents.html index 5fcd62a..1009e30 100644 --- a/coselmar-ui/src/main/webapp/views/documents/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents/documents.html @@ -47,18 +47,20 @@ <table class="table"> <tr> <th>Name</th> - <th>Owner</th> + <th>Authors</th> <th>Privacy</th> <th>Keywords</th> + <th>Depositor</th> <th>Deposit Date</th> <th>Related Question</th> <th></th> </tr> <tr ng-repeat="document in documents"> <td><a href="#/documents/{{document.id}}">{{document.name}}</a></td> - <td>{{document.ownerName}}</td> + <td>{{document.authors}}</td> <td>{{document.privacy}}</td> <td><span ng-repeat="keyword in document.keywords">{{keyword}} ,</span></td> + <td>{{document.ownerName}}</td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td>N/A</td> <td><a class="btn btn-action btn-disable" diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html index 8c79067..1e74a48 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html @@ -45,17 +45,19 @@ <table class="table"> <tr> <th>Name</th> - <th>Owner</th> + <th>Authors</th> <th>Privacy</th> <th>Keywords</th> + <th>Depositor</th> <th>Deposit Date</th> <th></th> </tr> <tr ng-repeat="document in documents"> <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> - <td>{{document.ownerName}}</td> + <td>{{document.authors}}</td> <td>{{document.privacy}}</td> <td><span ng-repeat="keyword in document.keywords">{{keyword}} ,</span></td> + <td>{{document.ownerName}}</td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td> <a class="btn fa fa-plus" title="Add Document" ng-click="select(document)"/></td> diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 9a82637..1973fb3 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -246,7 +246,7 @@ <!-- End Line with External Experts and Supervisor --> - <!-- Line with Related Document --> + <!-- Line with Parent Questions --> <div class="form-group" > @@ -281,7 +281,7 @@ </div> - <!-- End Line with Related Document --> + <!-- End Line with Parent Questions --> <!-- Line with Related Document --> @@ -294,8 +294,9 @@ <table class="table table-bordered table-condensed"> <tr> <th>Name</th> - <th>Owner</th> + <th>Authors</th> <th>Keywords</th> + <th>Depositor</th> <th>Deposit Date</th> <th> <a class="btn fa fa-search" title="Search document" @@ -306,8 +307,9 @@ </tr> <tr ng-repeat="document in question.relatedDocuments"> <td>{{document.name}}</a></td> - <td>{{document.ownerName}}</td> + <td>{{document.authors}}</td> <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + <td>{{document.ownerName}}</td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td><a class="btn fa fa-minus" title="Remove document" ng-click="removeDocument(document, question.relatedDocuments)" diff --git a/coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html b/coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html index e418365..2e67586 100644 --- a/coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html +++ b/coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html @@ -33,8 +33,9 @@ <table class="table table-bordered table-condensed"> <tr> <th>Name</th> - <th>Owner</th> + <th>Authors</th> <th>Keywords</th> + <th>Depositor</th> <th>Deposit Date</th> <th> <a class="btn fa fa-search" title="Search document" @@ -45,9 +46,10 @@ </tr> <tr ng-repeat="document in question.newRelatedDocuments"> <td>{{document.name}}</a></td> - <td>{{document.ownerName}}</td> + <td>{{document.authors}}</td> <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + <td>{{document.ownerName}}</td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td><a class="btn fa fa-minus" title="Remove document" ng-click="removeDocument(document, question.newRelatedDocuments)" /></td> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index 99dbcae..1bb35cb 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -148,14 +148,16 @@ <table class="table table-bordered table-condensed"> <tr> <th>Name</th> - <th>Owner</th> + <th>Authors</th> <th>Keywords</th> + <th>Depositor</th> <th>Deposit Date</th> </tr> <tr ng-repeat="document in question.relatedDocuments"> <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> - <td>{{document.ownerName}}</td> + <td>{{document.authors}}</td> <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + <td>{{document.ownerName}}</td> <td>{{document.depositDate | date:'mediumDate'}}</td> </tr> </table> @@ -185,14 +187,16 @@ <table class="table table-bordered table-condensed"> <tr> <th>Name</th> - <th>Owner</th> + <th>Authors</th> <th>Keywords</th> + <th>Depositor</th> <th>Deposit Date</th> </tr> <tr ng-repeat="document in question.closingDocuments"> <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> - <td>{{document.ownerName}}</td> + <td>{{document.authors}}</td> <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + <td>{{document.ownerName}}</td> <td>{{document.depositDate | date:'mediumDate'}}</td> </tr> </table> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm