Merge with abd73d06615e1dc427783e9dfa1d2ea4cf50eff7
authorcavaliet
Thu, 12 Sep 2013 11:42:29 +0200
changeset 73 d1b176885515
parent 72 dd1d59471697 (diff)
parent 71 abd73d06615e (current diff)
child 74 ad7d84868c98
child 79 d585f6b46b88
Merge with abd73d06615e1dc427783e9dfa1d2ea4cf50eff7
src/p4l/static/p4l/css/p4l.css
src/p4l/static/p4l/templates/imprintDisp.html
src/p4l/static/p4l/templates/volumeIssueForm.html
src/p4l/templates/p4l/p4l_home.html
--- a/src/p4l/static/p4l/css/p4l.css	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/css/p4l.css	Thu Sep 12 11:42:29 2013 +0200
@@ -22,18 +22,20 @@
 .two_buttons{
 	min-width: 100px;
 }
-
 footer {
     padding-bottom: 20px;    
 }
-
 .bottom-5 {
     margin-bottom: 5px;
 }
 .after-plus {
     padding-top: 5px;
 }
-
+.rotate{
+	transform:rotate(90deg);
+	-ms-transform:rotate(90deg);
+	-webkit-transform:rotate(90deg);
+}
 .spinner {
     width: 14px;
     height: 14px;
@@ -43,7 +45,6 @@
 	opacity: .7;
 	margin-right: 4px;
 }
-
 /* Flags */
 
 .flag {
--- a/src/p4l/static/p4l/templates/abstractForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/abstractForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -1,6 +1,6 @@
  <form class="well span3">
     <div class="span3 row">
      <label for="abstract-{{$id}}">{{'abstract'|translate}}</label><textarea placeholder="{{'abstract'|translate}}" ng_model="editedObj.abstract" name="abstract" id="abstract-{{$id}}" class="form-control span3"></textarea>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><input type="text" placeholder="{{'lang'|translate}}" ng_model="editedObj.lang" name="lang" id="lang-{{$id}}" class="span3"/>
+     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
      </div>
  </form>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/addSemanticUriForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/addSemanticUriForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -2,8 +2,11 @@
     <ul class="bottom-5">
         <li ng-repeat="item in list">{{uriLabels[item]}} <small class="text-muted">({{item}})</small> <a ng-click='removeFromList(item)' class="btn btn-default btn-xs"><i class="glyphicon glyphicon-trash"></i></a></li>
     </ul>
-    <a ng-click='formVisible=!formVisible' class="btn btn-default btn-xs"><i class="glyphicon glyphicon-plus-sign"></i></a>
-	<form class="form-inline after-plus" role="form" ng-show="formVisible==true">
+    <a ng-click='formVisible=!formVisible' class="btn btn-default btn-xs">
+        <i class="glyphicon glyphicon-plus-sign"></i>
+        <i class="glyphicon glyphicon-play" ng-class="{rotate: formVisible}"></i>
+    </a>
+	<form class="form-inline after-plus" role="form" ng-show="formVisible">
 	    <div class="form-group col-md-8">
 	        <input id="id_{{ $id }}" ng-model="addUriText" class="semantic-tree form-control col-md-10" type="text" placeholder="{{ placeholder }}"
 	               data-url="{{ dataurl }}" data-query="{{ dataquery }}" data-root-query="{{ datarootquery }}"
--- a/src/p4l/static/p4l/templates/collationForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/collationForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -1,6 +1,6 @@
  <form class="well span3">
     <div class="span3 row">
      <label for="collation-{{$id}}">{{'collation'|translate}}</label><input type="text" placeholder="{{'collation'|translate}}" ng_model="editedObj.collation" name="collation" id="collation-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><input type="text" placeholder="{{'lang'|translate}}" ng_model="editedObj.lang" name="lang" id="lang-{{$id}}" class="span3"/>
+     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
      </div>
  </form>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/imprintDisp.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/imprintDisp.html	Thu Sep 12 11:42:29 2013 +0200
@@ -1,6 +1,6 @@
-<ul class="list-unstyled">
-    <li>{{'City'|translate}} : {{ obj.imprintCity }}</li>
-    <li>{{'Publisher'|translate}} : {{ obj.publisher }}</li>
-    <li>{{'Date'|translate}} : {{ obj.imprintDate }}</li>
-    <li>{{'Language'|translate}} : {{ obj.lang }}</li>
-</ul>
+<tr>
+    <td>{{ obj.imprintCity }}</td>
+    <td>{{ obj.publisher }}</td>
+    <td>{{ obj.imprintDate }}</td>
+    <td>{{ obj.lang }}</td>
+</tr>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/imprintForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/imprintForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -5,6 +5,6 @@
      </div>
      <div class="span3 row">
      <label for="imprint-date-{{$id}}">{{'Date'|translate}}</label><input type="text" placeholder="{{'Date'|translate}}" ng_model="editedObj.imprintDate" name="imprintDate" id="imprint-date-{{$id}}" class="span3"/>
-     <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label><input type="text" placeholder="{{'Language'|translate}}" ng_model="editedObj.lang" name="lang" id="imprint-lang-{{$id}}" class="span3"/>
+     <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
      </div>
  </form>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/isbnForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/isbnForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -1,6 +1,6 @@
  <form class="well span3">
     <div class="span3 row">
      <label for="isbn-{{$id}}">{{'isbn'|translate}}</label><input type="text" placeholder="{{'isbn'|translate}}" ng_model="editedObj.isbn" name="isbn" id="isbn-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><input type="text" placeholder="{{'lang'|translate}}" ng_model="editedObj.lang" name="lang" id="lang-{{$id}}" class="span3"/>
+     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
      </div>
  </form>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/issnForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/issnForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -1,6 +1,6 @@
  <form class="well span3">
     <div class="span3 row">
      <label for="issn-{{$id}}">{{'issn'|translate}}</label><input type="text" placeholder="{{'issn'|translate}}" ng_model="editedObj.issn" name="issn" id="issn-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><input type="text" placeholder="{{'lang'|translate}}" ng_model="editedObj.lang" name="lang" id="lang-{{$id}}" class="span3"/>
+     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
      </div>
  </form>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/periodicalForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/periodicalForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -1,6 +1,6 @@
  <form class="well span3">
     <div class="span3 row">
      <label for="label-{{$id}}">{{'label'|translate}}</label><input type="text" placeholder="{{'label'|translate}}" ng_model="editedObj.label" name="label" id="label-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><input type="text" placeholder="{{'lang'|translate}}" ng_model="editedObj.lang" name="lang" id="lang-{{$id}}" class="span3"/>
+     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
      </div>
  </form>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/serieForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/serieForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -4,6 +4,6 @@
      <label for="imprint-volume-{{$id}}">{{'Volume'|translate}}</label><input type="text" placeholder="{{'Volume'|translate}}" ng_model="editedObj.imprintvolume" name="imprintvolume" id="imprint-volume-{{$id}}" class="span3"/>
      </div>
      <div class="span3 row">
-     <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label><input type="text" placeholder="{{'Language'|translate}}" ng_model="editedObj.lang" name="lang" id="imprint-lang-{{$id}}" class="span3"/>
+     <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
      </div>
  </form>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/titleForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/titleForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -1,8 +1,6 @@
  <form class="well span3">
     <div class="span3 row">
      <label for="title-{{$id}}">{{'title'|translate}}</label><input type="text" placeholder="{{'title'|translate}}" ng_model="editedObj.title" name="title" id="title-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label>
-     <languages-list-input obj="editedObj.lang"></languages-list-input>
-     <!--input type="text" placeholder="{{'lang'|translate}}" ng_model="editedObj.lang" name="lang" id="lang-{{$id}}" class="span3"/-->
+     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
      </div>
  </form>
\ No newline at end of file
--- a/src/p4l/static/p4l/templates/volumeIssueForm.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/static/p4l/templates/volumeIssueForm.html	Thu Sep 12 11:42:29 2013 +0200
@@ -1,9 +1,9 @@
  <form class="well span6">
     <div class="span3 row">
-     <label for="imprint-volume-{{$id}}">{{'Volume'|translate}}</label><input type="text" placeholder="{{'Volume'|translate}}" ng_model="editedObj.imprintvolume" name="imprintvolume" id="imprint-volume-{{$id}}" class="span3"/>
+     <label for="imprint-volume-{{$id}}">{{'Volume'|translate}}</label><input type="text" placeholder="{{'Volume'|translate}}" ng_model="editedObj.volume" name="volume" id="imprint-volume-{{$id}}" class="span3"/>
      <label for="imprint-number-{{$id}}">{{'Number'|translate}}</label><input type="text" placeholder="{{'Number'|translate}}" ng_model="editedObj.number" name="number" id="imprint-number-{{$id}}" class="span3"/>
      </div>
      <div class="span3 row">
-     <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label><input type="text" placeholder="{{'Language'|translate}}" ng_model="editedObj.lang" name="lang" id="imprint-lang-{{$id}}" class="span3"/>
+     <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
      </div>
  </form>
\ No newline at end of file
--- a/src/p4l/templates/p4l/p4l_home.html	Thu Sep 12 00:33:37 2013 +0200
+++ b/src/p4l/templates/p4l/p4l_home.html	Thu Sep 12 11:42:29 2013 +0200
@@ -36,16 +36,16 @@
 {% endif %}
 <table class="table">
   <thead>
-    <tr><td>URI</td><td>lang.</td><td>{% trans 'titles' %}</td><td class="two_buttons">{% trans 'actions' %}</td></tr>
+    <tr><td>{% trans 'identifier' %}</td><td>{% trans 'titles' %}</td><td>{% trans 'dates' %} (années imprint)</td><td class="two_buttons">{% trans 'actions' %}</td></tr>
   </thead>
   <tbody>
   {% for record in object_list %}
     <tr>
-      <td title="{{ record.uri }}">{{ record.uri|reduce:"4,13" }}</td>
-      <td title="{{ record.language.uri }}">{{ record.language.uri|reduce:"0,3" }}</td>
+      <td>{{ record.identifier }}</td>
       <td><ul>{% for t in record.titles.all %}
           <li>{{ t.title }}</li>
           {% endfor %}</ul></td>
+      <td>&nbsp;</td>
       <td>
         <a class="btn btn-default" href="{% url 'p4l_record_view' slug=record.identifier %}"><i class="glyphicon glyphicon-eye-open"></i></a>
         <a class="btn btn-default" href="{% url 'p4l_record_edit' slug=record.identifier %}"><i class="glyphicon glyphicon-pencil"></i></a>