view bugfixes + update skins for Bridge

This commit is contained in:
Ysolyne Gresille
2012-06-04 19:13:05 +02:00
parent 1563d9a5a8
commit 316941309d
33 changed files with 825 additions and 525 deletions

View File

@@ -98,6 +98,7 @@ class Bridge implements ControllerProviderInterface
$connector->reconnect(); $connector->reconnect();
} catch (\Exception $e) { } catch (\Exception $e) {
var_dump(get_class($e), $e->getFile(), $e->getLine(), $e->getTraceAsString());
$error_message = $e->getMessage(); $error_message = $e->getMessage();
} }

View File

@@ -1,27 +1,28 @@
<form> <form>
<div class="Feedback" style="display:none;"> <div class="Feedback" style="display:none;">
<label for="PushSendFormDuration">{{ language.FeedBackDuration }}</label> <label for="PushSendFormDuration">{{ language.FeedBackDuration }}</label>
<select id="PushSendFormDuration" name="duration"> <select id="PushSendFormDuration" name="duration">
<option value="20">20</option> <option value="20">20</option>
<option value="15">15</option> <option value="15">15</option>
<option value="10">10</option> <option value="10">10</option>
<option value="5">5</option> <option value="5">5</option>
<option value="3">3</option> <option value="3">3</option>
<option value="2">2</option> <option value="2">2</option>
<option value="1">1</option> <option value="1">1</option>
</select> </select>
</div> </div>
<div> <div>
<label for="PushSendFormRecept">{{ language.FeedBackName }}</label> <label for="PushSendFormRecept">{{ language.FeedBackName }}</label>
<input id="PushSendFormName" type="text" name="name"/> <input id="PushSendFormName" type="text" name="name"/>
</div> </div>
<div> <div>
<label for="PushSendFormMessage">{{ language.FeedBackMessage }}</label> <label for="PushSendFormMessage">{{ language.FeedBackMessage }}</label>
<textarea id="PushSendFormMessage" name="message"></textarea> <textarea id="PushSendFormMessage" name="message"></textarea>
</div> </div>
<div> <div>
<input id="PushSendFormRecept" type="checkbox" name="recept" value="1"/> <label for="PushSendFormRecept" class="checkbox">
<label for="PushSendFormRecept">{{ language.Recept }}</label> <input id="PushSendFormRecept" type="checkbox" name="recept" value="1"/>
</div> {{ language.Recept }}
</label>
</div>
</form> </form>

View File

@@ -119,14 +119,11 @@
<a href="#" style="font-weight:bold;text-decoration:none;"> <a href="#" style="font-weight:bold;text-decoration:none;">
<span> <span>
{% trans 'Notifications' %} {% trans 'Notifications' %}
<button class="counter btn btn-danger" style="visibility:{% if events.get_unread_notifications_number > 0 %}visible{% else %}hidden{% endif %};">
<span class="counter" style="visibility:{% if events.get_unread_notifications_number > 0 %}visible{% else %}hidden{% endif %};">
<div style="padding:1px 3px 0;">
{% if events.get_unread_notifications_number > 0 %} {% if events.get_unread_notifications_number > 0 %}
{{events.get_unread_notifications_number}} {{events.get_unread_notifications_number}}
{% endif %} {% endif %}
</div> </button>
</span>
</span> </span>
</a> </a>
</li> </li>

View File

@@ -1,13 +1,15 @@
<form method="POST" action="/prod/baskets/"> <form method="POST" action="/prod/baskets/">
<label>{% trans 'Nom du nouveau panier' %}</label> <label>{% trans 'Nom du nouveau panier' %}</label>
<input name="name" value="" type="text"/> <input name="name" value="" type="text"/>
<label>{% trans 'paniers::description du nouveau panier' %}</label> <label>{% trans 'paniers::description du nouveau panier' %}</label>
<textarea name="description"></textarea> <textarea name="description"></textarea>
<input type="checkbox" name="lst" value=""/> <label for="add_sel" class="checkbox">
<label for="add_sel">{% trans 'Ajouter ma selection courrante' %}</label> <input type="checkbox" name="lst" value=""/>
{% trans 'Ajouter ma selection courrante' %}
</label>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){

View File

@@ -1,17 +1,19 @@
<form method="POST" action="/prod/story/"> <form method="POST" action="/prod/story/">
<label>{% trans 'Collection' %}</label> <label>{% trans 'Collection' %}</label>
<select name="base_id"> <select name="base_id">
{% for collection in user.ACL().get_granted_base(['canaddrecord']) %} {% for collection in user.ACL().get_granted_base(['canaddrecord']) %}
<option value="{{ collection.get_base_id() }}">{{ collection.get_databox().get_viewname() }} / {{ collection.get_name() }}</option> <option value="{{ collection.get_base_id() }}">{{ collection.get_databox().get_viewname() }} / {{ collection.get_name() }}</option>
{% endfor %} {% endfor %}
</select> </select>
<label>{% trans 'Story name' %}</label> <label>{% trans 'Story name' %}</label>
<input name="name" value="" type="text"/> <input name="name" value="" type="text"/>
<label for="add_sel">{% trans 'Ajouter ma selection courrante' %}</label> <label for="add_sel" class="checkbox">
<input type="checkbox" name="lst" value=""/> <input type="checkbox" name="lst" value=""/>
{% trans 'Ajouter ma selection courrante' %}
</label>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){

View File

@@ -1,25 +1,28 @@
<td>
<td> <form class="action_works_standalone action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/createcontainer/{{action_type}}/">
<form class="action_works_standalone action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/createcontainer/{{action_type}}/"> <button class="form_multiple_submitter single_menu btn btn-inverse">
<button class="form_multiple_submitter single_menu">
{% trans 'Creer' %} {% trans 'Creer' %}
</button>
</form>
</td>
<td>
<div class="multi_menu">
<div class="btn-group">
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
{% trans 'Actions' %}
<span class="caret"></span>
</button> </button>
</form> <ul class="dropdown-menu">
</td> <li>
<td> <form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/">
<div class="multi_menu"> <input type="hidden" name="elements_list" value="" />
<div> <input type="hidden" name="destination" value="" />
<button class="trigger">{% trans 'Actions' %}</button> <button class="form_multiple_submitter btn btn-inverse">
</div> {% trans 'boutton::supprimer' %}
</button>
<div class="submenu" style="display:none;position:absolute;"> </form>
<form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/"> </li>
<input type="hidden" name="elements_list" value="" /> </ul>
<input type="hidden" name="destination" value="" />
<button class="form_multiple_submitter" style="">
{% trans 'boutton::supprimer' %}
</button>
</form>
</div>
</div> </div>
</td> </div>
</td>

View File

@@ -1,35 +1,42 @@
<td>
<td> <div class="multi_menu">
<div class="multi_menu"> <div class="btn-group">
<div> <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
<button class="trigger">{% trans 'Ajouter a' %}</button> {% trans 'Ajouter a' %}
</div> <span class="caret"></span>
</button>
<div class="submenu" style="display:none;position:absolute;"> <ul class="dropdown-menu">
<form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/moveinto/{{action_type}}/"> <li>
<input type="hidden" name="elements_list" value="" /> <form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/moveinto/{{action_type}}/">
<input type="hidden" name="destination" value="{{ constant('Bridge_Api_Dailymotion::CONTAINER_TYPE_PLAYLIST') }}" /> <input type="hidden" name="elements_list" value="" />
<button class="form_multiple_submitter" style=""> <input type="hidden" name="destination" value="{{ constant('Bridge_Api_Dailymotion::CONTAINER_TYPE_PLAYLIST') }}" />
{% trans 'Playlist' %} <button class="form_multiple_submitter btn btn-inverse">
</button> {% trans 'Playlist' %}
</form> </button>
</div> </form>
</li>
</ul>
</div> </div>
</td> </div>
<td> </td>
<div class="multi_menu"> <td>
<div> <div class="multi_menu">
<button class="trigger">{% trans 'Actions' %}</button> <div class="btn-group">
</div> <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
{% trans 'Actions' %}
<div class="submenu" style="display:none;position:absolute;"> <span class="caret"></span>
<form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/"> </button>
<input type="hidden" name="elements_list" value="" /> <ul class="dropdown-menu">
<input type="hidden" name="destination" value="" /> <li>
<button class="form_multiple_submitter" style=""> <form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/">
{% trans 'boutton::supprimer' %} <input type="hidden" name="elements_list" value="" />
</button> <input type="hidden" name="destination" value="" />
</form> <button class="form_multiple_submitter btn btn-inverse">
</div> {% trans 'boutton::supprimer' %}
</button>
</form>
</li>
</ul>
</div> </div>
</td> </div>
</td>

View File

@@ -23,8 +23,8 @@
</tr> </tr>
<td></td> <td></td>
<td class='column_right'> <td class='column_right'>
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</td> </td>
</tr> </tr>
</table> </table>

View File

@@ -20,7 +20,7 @@
<input type="hidden" name="elements_list[]" value="{{id}}"/> <input type="hidden" name="elements_list[]" value="{{id}}"/>
{% endfor %} {% endfor %}
<input type="hidden" name="destination" value="{{ destination }}" /> <input type="hidden" name="destination" value="{{ destination }}" />
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</form> </form>
{% endblock %} {% endblock %}

View File

@@ -20,7 +20,7 @@
<input type="hidden" name="elements_list[]" value="{{id}}"/> <input type="hidden" name="elements_list[]" value="{{id}}"/>
{% endfor %} {% endfor %}
<input type="hidden" name="destination" value="{{ destination }}" /> <input type="hidden" name="destination" value="{{ destination }}" />
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</form> </form>
{% endblock %} {% endblock %}

View File

@@ -28,7 +28,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
<input type="hidden" name="destination" value="{{ destination }}" /> <input type="hidden" name="destination" value="{{ destination }}" />
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</form> </form>
{% endblock %} {% endblock %}

View File

@@ -1,25 +1,28 @@
<td>
<td> <form class="action_works_standalone action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/createcontainer/{{action_type}}/">
<form class="action_works_standalone action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/createcontainer/{{action_type}}/"> <button class="form_multiple_submitter single_menu btn btn-inverse">
<button class="form_multiple_submitter single_menu">
{% trans 'Creer' %} {% trans 'Creer' %}
</button>
</form>
</td>
<td>
<div class="multi_menu">
<div class="btn-group">
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
{% trans 'Actions' %}
<span class="caret"></span>
</button> </button>
</form> <ul class="dropdown-menu">
</td> <li>
<td> <form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/">
<div class="multi_menu"> <input type="hidden" name="elements_list" value="" />
<div> <input type="hidden" name="destination" value="" />
<button class="trigger">{% trans 'Actions' %}</button> <button class="form_multiple_submitter btn btn-inverse">
</div> {% trans 'boutton::supprimer' %}
</button>
<div class="submenu" style="display:none;position:absolute;"> </form>
<form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/"> </li>
<input type="hidden" name="elements_list" value="" /> </ul>
<input type="hidden" name="destination" value="" />
<button class="form_multiple_submitter" style="">
{% trans 'boutton::supprimer' %}
</button>
</form>
</div>
</div> </div>
</td> </div>
</td>

View File

@@ -1,35 +1,42 @@
<td>
<td> <div class="multi_menu">
<div class="multi_menu"> <div class="btn-group">
<div> <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
<button class="trigger">{% trans 'Ajouter a' %}</button> {% trans 'Ajouter a' %}
</div> <span class="caret"></span>
</button>
<div class="submenu" style="display:none;position:absolute;"> <ul class="dropdown-menu">
<form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/moveinto/{{action_type}}/"> <li>
<input type="hidden" name="elements_list" value="" /> <form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/moveinto/{{action_type}}/">
<input type="hidden" name="destination" value="{{ constant('Bridge_Api_Flickr::CONTAINER_TYPE_PHOTOSET') }}" /> <input type="hidden" name="elements_list" value="" />
<button class="form_multiple_submitter" style=""> <input type="hidden" name="destination" value="{{ constant('Bridge_Api_Flickr::CONTAINER_TYPE_PHOTOSET') }}" />
{% trans 'Photosets' %} <button class="form_multiple_submitter btn btn-inverse">
</button> {% trans 'Photosets' %}
</form> </button>
</div> </form>
</li>
</ul>
</div> </div>
</td> </div>
<td> </td>
<div class="multi_menu"> <td>
<div> <div class="multi_menu">
<button class="trigger">{% trans 'Actions' %}</button> <div class="btn-group">
</div> <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
{% trans 'Actions' %}
<div class="submenu" style="display:none;position:absolute;"> <span class="caret"></span>
<form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/"> </button>
<input type="hidden" name="elements_list" value="" /> <ul class="dropdown-menu">
<input type="hidden" name="destination" value="" /> <li>
<button class="form_multiple_submitter" style=""> <form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/">
{% trans 'boutton::supprimer' %} <input type="hidden" name="elements_list" value="" />
</button> <input type="hidden" name="destination" value="" />
</form> <button class="form_multiple_submitter btn btn-inverse">
</div> {% trans 'boutton::supprimer' %}
</button>
</form>
</li>
</ul>
</div> </div>
</td> </div>
</td>

View File

@@ -20,7 +20,7 @@
<input type="hidden" name="elements_list[]" value="{{id}}"/> <input type="hidden" name="elements_list[]" value="{{id}}"/>
{% endfor %} {% endfor %}
<input type="hidden" name="destination" value="{{ destination }}" /> <input type="hidden" name="destination" value="{{ destination }}" />
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</form> </form>
{% endblock %} {% endblock %}

View File

@@ -28,7 +28,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
<input type="hidden" name="destination" value="{{ destination }}" /> <input type="hidden" name="destination" value="{{ destination }}" />
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</form> </form>
{% endblock %} {% endblock %}

View File

@@ -52,8 +52,8 @@
<tr> <tr>
<td></td> <td></td>
<td class='column_right'> <td class='column_right'>
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</td> </td>
</tr> </tr>
</table> </table>

View File

@@ -20,7 +20,7 @@
<input type="hidden" name="elements_list[]" value="{{id}}"/> <input type="hidden" name="elements_list[]" value="{{id}}"/>
{% endfor %} {% endfor %}
<input type="hidden" name="destination" value="{{ destination }}" /> <input type="hidden" name="destination" value="{{ destination }}" />
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</form> </form>
{% endblock %} {% endblock %}

View File

@@ -1,25 +1,28 @@
<td>
<td> <form class="action_works_standalone action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/createcontainer/{{action_type}}/">
<form class="action_works_standalone action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/createcontainer/{{action_type}}/"> <button class="form_multiple_submitter single_menu btn btn-inverse">
<button class="form_multiple_submitter single_menu">
{% trans 'Creer' %} {% trans 'Creer' %}
</button>
</form>
</td>
<td>
<div class="multi_menu">
<div class="btn-group">
<button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
{% trans 'Actions' %}
<span class="caret"></span>
</button> </button>
</form> <ul class="dropdown-menu">
</td> <li>
<td> <form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/">
<div class="multi_menu"> <input type="hidden" name="elements_list" value="" />
<div> <input type="hidden" name="destination" value="" />
<button class="trigger">{% trans 'Actions' %}</button> <button class="form_multiple_submitter btn btn-inverse">
</div> {% trans 'boutton::supprimer' %}
</button>
<div class="submenu" style="display:none;position:absolute;"> </form>
<form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/"> </li>
<input type="hidden" name="elements_list" value="" /> </ul>
<input type="hidden" name="destination" value="" />
<button class="form_multiple_submitter" style="">
{% trans 'boutton::supprimer' %}
</button>
</form>
</div>
</div> </div>
</td> </div>
</td>

View File

@@ -1,35 +1,42 @@
<td style="width:100px;">
<td style="width:120px;"> <div class="multi_menu">
<div class="multi_menu"> <div class="btn-group">
<div> <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
<button class="trigger">{% trans 'Ajouter a' %}</button> {% trans 'Ajouter a' %}
</div> <span class="caret"></span>
</button>
<div class="submenu" style="display:none;position:absolute;"> <ul class="dropdown-menu">
<form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/moveinto/{{action_type}}/"> <li>
<input type="hidden" name="elements_list" value="" /> <form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/moveinto/{{action_type}}/">
<input type="hidden" name="destination" value="{{ constant('Bridge_Api_Youtube::CONTAINER_TYPE_PLAYLIST') }}" /> <input type="hidden" name="elements_list" value="" />
<button class="form_multiple_submitter" style=""> <input type="hidden" name="destination" value="{{ constant('Bridge_Api_Youtube::CONTAINER_TYPE_PLAYLIST') }}" />
{% trans 'Playlist' %} <button class="form_multiple_submitter btn btn-inverse">
</button> {% trans 'Playlist' %}
</form> </button>
</div> </form>
</li>
</ul>
</div> </div>
</td> </div>
<td style="width:120px;"> </td>
<div class="multi_menu"> <td style="width:100px;">
<div> <div class="multi_menu">
<button class="trigger">{% trans 'Actions' %}</button> <div class="btn-group">
</div> <button class="trigger btn btn-inverse dropdown-toggle" data-toggle="dropdown">
{% trans 'Actions' %}
<div class="submenu" style="display:none;position:absolute;"> <span class="caret"></span>
<form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/"> </button>
<input type="hidden" name="elements_list" value="" /> <ul class="dropdown-menu">
<input type="hidden" name="destination" value="" /> <li>
<button class="form_multiple_submitter" style=""> <form class="action_works_single_element action_works_many_element" method="GET" action="/prod/bridge/action/{{ account.get_id() }}/deleteelement/{{action_type}}/">
{% trans 'boutton::supprimer' %} <input type="hidden" name="elements_list" value="" />
</button> <input type="hidden" name="destination" value="" />
</form> <button class="form_multiple_submitter btn btn-inverse">
</div> {% trans 'boutton::supprimer' %}
</button>
</form>
</li>
</ul>
</div> </div>
</td> </div>
</td>

View File

@@ -35,8 +35,8 @@
<tr> <tr>
<td></td> <td></td>
<td class='column_right'> <td class='column_right'>
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</td> </td>
</tr> </tr>
</table> </table>

View File

@@ -20,7 +20,7 @@
<input type="hidden" name="elements_list[]" value="{{id}}"/> <input type="hidden" name="elements_list[]" value="{{id}}"/>
{% endfor %} {% endfor %}
<input type="hidden" name="destination" value="{{ destination }}" /> <input type="hidden" name="destination" value="{{ destination }}" />
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</form> </form>
{% endblock %} {% endblock %}

View File

@@ -123,6 +123,6 @@
</script> </script>
{% endif %} {% endif %}
<p> <p>
<button class="back_link">&lt; {% trans 'Retour' %}</button> <button class="back_link btn btn-inverse">&lt; {% trans 'Retour' %}</button>
</p> </p>
{% endblock %} {% endblock %}

View File

@@ -20,7 +20,7 @@
<input type="hidden" name="elements_list[]" value="{{id}}"/> <input type="hidden" name="elements_list[]" value="{{id}}"/>
{% endfor %} {% endfor %}
<input type="hidden" name="destination" value="{{ destination }}" /> <input type="hidden" name="destination" value="{{ destination }}" />
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</form> </form>
{% endblock %} {% endblock %}

View File

@@ -28,7 +28,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
<input type="hidden" name="destination" value="{{ destination }}" /> <input type="hidden" name="destination" value="{{ destination }}" />
<button class="form_submitter">{% trans 'boutton::valider' %}</button> <button class="form_submitter btn btn-inverse">{% trans 'boutton::valider' %}</button>
<button class="back_link">{% trans 'boutton::retour' %}</button> <button class="back_link btn btn-inverse">{% trans 'boutton::retour' %}</button>
</form> </form>
{% endblock %} {% endblock %}

View File

@@ -1,30 +1,29 @@
<div class="PNB10 container"> <div class="PNB10 container">
<div class="PNB"> <div class="PNB">
<p style="text-align:center;margin:40px 20px 20px;"> <p style="text-align:center;margin:40px 20px 20px;">
{% trans 'Vous etes actuellement deconnecte de votre compte, vous devez vous connecter pour continuer' %} {% trans 'Vous etes actuellement deconnecte de votre compte, vous devez vous connecter pour continuer' %}
</p> </p>
<table style="width:300px;margin:10px auto;"> <table style="width:300px;margin:10px auto;">
<tbody> <tbody>
<tr style="text-align:center;"> <tr style="text-align:center;">
<td> <td>
<form> <form>
<button class="login_button new_bridge_button"> <button class="login_button new_bridge_button btn btn-inverse">
{% trans 'login:: connexion' %} {% trans 'login:: connexion' %}
</button> </button>
<input type="hidden" name="url" value="{{account.get_api().generate_login_url(registry, account.get_api().get_connector().get_name()) }}" /> <input type="hidden" name="url" value="{{account.get_api().generate_login_url(registry, account.get_api().get_connector().get_name()) }}" />
</form> </form>
</td> </td>
<td> <td>
<form method="{{r_method}}" action="{{r_action}}"> <form method="{{r_method}}" action="{{r_action}}">
{% for key, value in r_parameters %} {% for key, value in r_parameters %}
<input type="hidden" name="{{key}}" value="{{value}}" /> <input type="hidden" name="{{key}}" value="{{value}}" />
{% endfor %} {% endfor %}
<button class="form_submitter single_menu" >{% trans 'boutton::refresh' %}</button> <button class="form_submitter single_menu btn btn-inverse" >{% trans 'boutton::refresh' %}</button>
</form> </form>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>

View File

@@ -2,50 +2,43 @@
{% import "prod/actions/Bridge/paginator.twig" as pages %} {% import "prod/actions/Bridge/paginator.twig" as pages %}
{% block menu %} {% block menu %}
<table style="width:100%; height:40px;">
<tr>
<td style="width:20px;">
<form name="bridge_selection">
<input class="bridge_all_selector" type="checkbox" value="">
<input type="hidden" name="elements_list" value="" />
</form>
</td>
{% if adapter_action == 'load-elements' %}
{% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actionelements.twig' %}
{% elseif adapter_action == 'load-containers' %}
{% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actioncontainers.twig' %}
{% endif %}
<table style="width:100%;height:40px;"> {% include actiontemplate %}
<tr>
<td style="width:20px;">
<form name="bridge_selection">
<input class="bridge_all_selector" type="checkbox" value="">
<input type="hidden" name="elements_list" value="" />
</form>
</td>
{% if adapter_action == 'load-elements' %}
{% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actionelements.twig' %}
{% elseif adapter_action == 'load-containers' %}
{% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actioncontainers.twig' %}
{% endif %}
{% include actiontemplate %} {% if not elements.get_total_items is none %}
<!--<td style="width:40px;">
{% if not elements.get_total_items is none %} <div class="menu_nb_element">
<!--<td style="width:40px;"> {% set nb_elements = elements.get_total_items() %}
<div class="menu_nb_element"> {% trans %}
{% set nb_elements = elements.get_total_items() %} {{nb_elements}} elements
{% trans %} {% endtrans %}
{{nb_elements}} elements </div>
{% endtrans %} </td>-->
</div> {% endif %}
</td>--> <td style="text-align:right;">
{% endif %} {% set url = '/prod/bridge/adapter/' ~ account.get_id ~ '/' ~ adapter_action ~ '/' ~ action_type ~ '/' %}
<td style="text-align:right;"> {{pages.paginator(elements.get_total_page(), elements.get_current_page(), url) }}
</td>
</tr>
{% set url = '/prod/bridge/adapter/' ~ account.get_id ~ '/' ~ adapter_action ~ '/' ~ action_type ~ '/' %}
{{pages.paginator(elements.get_total_page(), elements.get_current_page(), url) }}
</td>
</tr>
</table> </table>
{% endblock %} {% endblock %}
{% block response %} {% block response %}
{%for element in elements.get_elements%} {%for element in elements.get_elements%}
<div class="element {{ loop.index is odd ? 'odd' : 'even' }}"> <div class="element {{ loop.index is odd ? 'odd' : 'even' }}">
<table> <table>
<tr> <tr>
@@ -117,9 +110,9 @@
<tr> <tr>
<td colspan="4" style="text-align:right;"> <td colspan="4" style="text-align:right;">
{% if adapter_action == 'load-elements' %} {% if adapter_action == 'load-elements' %}
{% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actionelement.twig' %} {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actionelement.twig' %}
{% elseif adapter_action == 'load-containers' %} {% elseif adapter_action == 'load-containers' %}
{% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actioncontainer.twig' %} {% set actiontemplate = 'prod/actions/Bridge/' ~ account.get_api().get_connector().get_name() ~ '/actioncontainer.twig' %}
{% endif %} {% endif %}
{% include actiontemplate %} {% include actiontemplate %}
@@ -127,7 +120,5 @@
</tr> </tr>
</table> </table>
</div> </div>
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}

View File

@@ -2,8 +2,8 @@
{% import "common/thumbnail.html" as thumb %} {% import "common/thumbnail.html" as thumb %}
<div class="PNB main_window"> <div class="PNB main_window">
<div id='publicator_selection' class="PNB10 ui-corner-all" style="height:190px;bottom:auto;background-color:#404040;"> <div id='publicator_selection' class="PNB10 ui-corner-all">
<div class="PNB10" style="overflow:auto;bottom:50px;background-color:#111111;"> <div class="PNB10">
{% for id, record in route.get_elements %} {% for id, record in route.get_elements %}
<div id='pub_record_{{record.get_serialize_key()}}' class="diapo"> <div id='pub_record_{{record.get_serialize_key()}}' class="diapo">
<div class="title">{{ record.get_title() }}</div> <div class="title">{{ record.get_title() }}</div>
@@ -12,8 +12,8 @@
{% endfor %} {% endfor %}
</div> </div>
<form name="upload_form" method="GET" action="/prod/bridge/upload/"> <form name="upload_form" method="GET" action="/prod/bridge/upload/">
<div class="PNB10 record_actions" style="top:auto;height:30px;text-align:right;"> <div class="PNB10 record_actions" style="top:auto; height:30px; text-align:right;">
<button class="single_menu act_upload">{% trans 'Upload' %}</button> <button class="single_menu act_upload btn btn-inverse">{% trans 'Upload' %}</button>
</div> </div>
<input name="lst" type="hidden" value=""/> <input name="lst" type="hidden" value=""/>
<input name="account_id" type="hidden" value=""/> <input name="account_id" type="hidden" value=""/>
@@ -49,9 +49,9 @@
{% if available_apis|length > 0 %} {% if available_apis|length > 0 %}
{% for api in available_apis %} {% for api in available_apis %}
{% if api.get_connector().is_configured() %} {% if api.get_connector().is_configured() %}
<form style="float:left;margin:5px;"> <form style="float:left; margin:5px;">
<button class="login_button new_bridge_button"> <button class="login_button new_bridge_button btn btn-inverse">
<table style="border:none;width:250px;"> <table style="border:none; width:250px;">
<tr style="vertical-align:middle;"> <tr style="vertical-align:middle;">
<td style="width:130px;"> <td style="width:130px;">
{% if api.get_connector().get_image_url() %} {% if api.get_connector().get_image_url() %}
@@ -69,7 +69,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
{% trans 'Aucun bridge disponible. Veuillez contacté un administrateur.' %} {% trans 'Aucun bridge disponible. Veuillez contacter un administrateur.' %}
{% endif %} {% endif %}
</div> </div>
</div> </div>
@@ -105,13 +105,10 @@ $(function() {
popme(url); popme(url);
return false; return false;
}).button(); });
$('.error_box, .notice_box', $panel).delay(10000).fadeOut(); $('.error_box, .notice_box', $panel).delay(10000).fadeOut();
$(".multi_menu", $panel).buttonsetv();
$(".single_menu", $panel).button();
$('.back_link', $panel).bind('click', function(){ $('.back_link', $panel).bind('click', function(){
$('#pub_tabs').tabs('load',$('#pub_tabs').tabs('option', 'selected')); $('#pub_tabs').tabs('load',$('#pub_tabs').tabs('option', 'selected'));
@@ -139,6 +136,7 @@ $(function() {
return false; return false;
}); });
$('.form_submitter', $panel).bind('click', function(){ $('.form_submitter', $panel).bind('click', function(){
var $form = $(this).closest('form'); var $form = $(this).closest('form');
var method = $form.attr('method'); var method = $form.attr('method');
@@ -168,9 +166,6 @@ $(function() {
}); });
$(".bridge_all_selector", $panel).bind("click", function() { $(".bridge_all_selector", $panel).bind("click", function() {
var checkboxes = $('.bridge_element_selector', $panel); var checkboxes = $('.bridge_element_selector', $panel);
var $this = $(this); var $this = $(this);
@@ -305,7 +300,7 @@ $(function() {
popme(url); popme(url);
return false; return false;
}).button(); });
$("ul li a.account", pub_tabs).bind("click", function(){ $("ul li a.account", pub_tabs).bind("click", function(){
$('form[name="current_datas"] input[name="account_id"]', container).val($('input[name="account_id"]', this).val()); $('form[name="current_datas"] input[name="account_id"]', container).val($('input[name="account_id"]', this).val());
@@ -359,8 +354,6 @@ $(function() {
$("#api_connexion").click(function(){ $("#api_connexion").click(function(){
container.dialog("close") container.dialog("close")
}); });
$('.multi_menu', container).buttonsetv();
$('.single_menu', container).button();
{% if route.get_count_element_received() == 0 %} {% if route.get_count_element_received() == 0 %}
alert('{% trans "Vous n\'avez selectionne aucun element" %}'); alert('{% trans "Vous n\'avez selectionne aucun element" %}');

View File

@@ -1,78 +1,77 @@
<div class="PNB10 container"> <div class="PNB10 container">
<div class="PNB" > <div class="PNB" >
<div class="api_banner PNB"> <div class="api_banner PNB">
<table style="width:100%;height:20px;"> <table style="width:100%; height:20px;">
<tbody> <tbody>
<tr> <tr>
<td> <td>
{% for type, display_name in account.get_api().get_connector().get_element_types() %} {% for type, display_name in account.get_api().get_connector().get_element_types() %}
<a class="{% if adapter_action == 'load-elements' and action_type == type %} selected {% endif %} action_type_{{type}} bridge_action bridge_title" href="/prod/bridge/adapter/{{ account.get_id() }}/load-elements/{{ type }}/"> <a class="{% if adapter_action == 'load-elements' and action_type == type %} selected {% endif %} action_type_{{type}} bridge_action bridge_title" href="/prod/bridge/adapter/{{ account.get_id() }}/load-elements/{{ type }}/">
{{ display_name }} {{ display_name }}
</a> </a>
{% if not loop.last %} - {% endif %} {% if not loop.last %} - {% endif %}
{% endfor %} {% endfor %}
| |
{% for type, display_name in account.get_api().get_connector().get_container_types() %} {% for type, display_name in account.get_api().get_connector().get_container_types() %}
<a class="{% if adapter_action == 'load-containers' and action_type == type %} selected {% endif %} action_type_{{type}} bridge_action bridge_title" href="/prod/bridge/adapter/{{ account.get_id() }}/load-containers/{{ type }}/"> <a class="{% if adapter_action == 'load-containers' and action_type == type %} selected {% endif %} action_type_{{type}} bridge_action bridge_title" href="/prod/bridge/adapter/{{ account.get_id() }}/load-containers/{{ type }}/">
{{ display_name }} {{ display_name }}
</a> </a>
{% if not loop.last %} - {% endif %} {% if not loop.last %} - {% endif %}
{% endfor %} {% endfor %}
|  | 
<a class="{% if adapter_action == 'load-records' %} selected {% endif %} bridge_action bridge_title" href="/prod/bridge/adapter/{{ account.get_id() }}/load-records/"> <a class="{% if adapter_action == 'load-records' %} selected {% endif %} bridge_action bridge_title" href="/prod/bridge/adapter/{{ account.get_id() }}/load-records/">
{% trans 'Fichiers envoyes' %} {% trans 'Fichiers envoyes' %}
</a> </a>
</td> </td>
<td style="text-align:right;"> <td style="text-align:right;">
{% if account %} {% if account %}
<a class="bridge_action" href="/prod/bridge/adapter/{{ account.get_id() }}/logout/"> <a class="bridge_action" href="/prod/bridge/adapter/{{ account.get_id() }}/logout/">
{% trans 'phraseanet:: deconnection' %} {% trans 'phraseanet:: deconnection' %}
</a> </a>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
<div class="api_content PNB">
<div class="blockmenu PNB" style="height:100%;bottom:auto;overflow:hidden;">
<div class="PNB10" style="bottom:0;top:0;">
{% block menu %}{% endblock %}
</div> </div>
</div> <div class="api_content PNB">
<div class="blockresponse PNB" style="top:40px;overflow:auto;overflow:auto;"> <div class="blockmenu PNB">
{% if error_message %} <div class="PNB10" style="bottom:0; top:0;">
<div class="ui-corner-all error_box">{{ error_message }}</div> {% block menu %}{% endblock %}
{% endif %} </div>
{% if notice_message %} </div>
<div class="ui-corner-all notice_box">{{ notice_message }}</div> <div class="blockresponse PNB">
{% endif %} {% if error_message %}
{% block response %}{% endblock %} <div class="ui-corner-all error_box">{{ error_message }}</div>
</div>
</div>
<div class="PNB api_infos">
<div class="PNB10" style="top:0;bottom:0;">
<table style="width:100%;height:25px;">
<tbody>
<tr>
<td>
{% if account.get_api().get_connector().get_terms_url() %}
<a href="{{ account.get_api().get_connector().get_terms_url() }}" target="_blank">
{% trans 'Terms of service' %}
</a>
{% endif %} {% endif %}
</td> {% if notice_message %}
<td style="text-align:right;"> <div class="ui-corner-all notice_box">{{ notice_message }}</div>
<a href="{{ account.get_api().get_connector().get_url() }}" target="_blank"> {% endif %}
{{ account.get_api().get_connector().get_infos() }} {% block response %}{% endblock %}
<img style="height:16px;vertical-align:middle;" src="{{ account.get_api().get_connector().get_icon_url() }}" /> </div>
</a> </div>
</td> <div class="PNB api_infos">
</tr> <div class="PNB10" style="top:0; bottom:0;">
</tbody> <table style="width:100%; height:25px;">
</table> <tbody>
</div> <tr>
<td>
{% if account.get_api().get_connector().get_terms_url() %}
<a href="{{ account.get_api().get_connector().get_terms_url() }}" target="_blank">
{% trans 'Terms of service' %}
</a>
{% endif %}
</td>
<td style="text-align:right;">
<a href="{{ account.get_api().get_connector().get_url() }}" target="_blank">
{{ account.get_api().get_connector().get_infos() }}
<img style="height:16px;vertical-align:middle;" src="{{ account.get_api().get_connector().get_icon_url() }}" />
</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div> </div>
</div>
</div> </div>

View File

@@ -1058,24 +1058,30 @@
<h1>{% trans 'Presentation de vignettes de panier' %}</h1> <h1>{% trans 'Presentation de vignettes de panier' %}</h1>
<div> <div>
{% set basket_status_display = user.getPrefs('basket_status_display') %} {% set basket_status_display = user.getPrefs('basket_status_display') %}
<input onchange="setPref('basket_status_display',($(this).attr('checked') ? '1' :'0'))" <label for="basket_status_display" class="checkbox">
<input onchange="setPref('basket_status_display',($(this).attr('checked') ? '1' :'0'))"
name="basket_status_display" type="checkbox" class="checkbox" value="1" name="basket_status_display" type="checkbox" class="checkbox" value="1"
id="basket_status_display" {% if basket_status_display == '1' %}checked="checked"{% endif %} /> id="basket_status_display" {% if basket_status_display == '1' %}checked="checked"{% endif %} />
<label for="basket_status_display">{% trans 'Afficher les status' %}</label> {% trans 'Afficher les status' %}
</label>
</div> </div>
<div> <div>
{% set basket_caption_display = user.getPrefs('basket_caption_display') %} {% set basket_caption_display = user.getPrefs('basket_caption_display') %}
<input onchange="setPref('basket_caption_display',($(this).attr('checked') ? '1' :'0'))" <label for="basket_caption_display" class="checkbox">
<input onchange="setPref('basket_caption_display',($(this).attr('checked') ? '1' :'0'))"
name="basket_caption_display" type="checkbox" class="checkbox" value="1" name="basket_caption_display" type="checkbox" class="checkbox" value="1"
id="basket_caption_display" {% if basket_caption_display == '1' %}checked="checked"{% endif %} /> id="basket_caption_display" {% if basket_caption_display == '1' %}checked="checked"{% endif %} />
<label for="basket_caption_display">{% trans 'Afficher la fiche descriptive' %}</label> {% trans 'Afficher la fiche descriptive' %}
</label>
</div> </div>
<div> <div>
{% set basket_title_display = user.getPrefs('basket_title_display') %} {% set basket_title_display = user.getPrefs('basket_title_display') %}
<input onchange="setPref('basket_title_display',($(this).attr('checked') ? '1' :'0'))" <label for="basket_title_display" class="checkbox">
<input onchange="setPref('basket_title_display',($(this).attr('checked') ? '1' :'0'))"
name="basket_title_display" type="checkbox" class="checkbox" value="1" name="basket_title_display" type="checkbox" class="checkbox" value="1"
id="basket_title_display" {% if basket_title_display == '1' %}checked="checked"{% endif %} /> id="basket_title_display" {% if basket_title_display == '1' %}checked="checked"{% endif %} />
<label for="basket_title_display">{% trans 'Afficher le titre' %}</label> {% trans 'Afficher le titre' %}
</label>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -523,7 +523,7 @@ foreach ($types as $sbas_id => $typeBR) {
echo '<div style="with:100%;text-align:center;font-size:10px;float:left;width:100px;height:130px;">Record ' . $rec2[1] . "<br/>"; echo '<div style="with:100%;text-align:center;font-size:10px;float:left;width:100px;height:130px;">Record ' . $rec2[1] . "<br/>";
$thumbnail = $record->get_thumbnail(); $thumbnail = $record->get_thumbnail();
echo '<div style="height:67px;"><img src="' . $thumbnail->get_url() . '" width="' . ($thumbnail->get_width() / 3) . '" height="' . ($thumbnail->get_height() / 3) . '" /></div>'; echo '<div style="height:80px;width:100px;display:table-cell;vertical-align:middle;"><img src="' . $thumbnail->get_url() . '" width="' . ($thumbnail->get_width() / 3) . '" height="' . ($thumbnail->get_height() / 3) . '" /></div>';
echo '<div style="height:26px;">' . $select . '</div></div>'; echo '<div style="height:26px;">' . $select . '</div></div>';
flush(); flush();
} }

View File

@@ -517,14 +517,16 @@ span.ww_winTitle {
} }
#tool_navigate a { #tool_navigate a {
cursor: pointer; padding: 1px 5px;
margin: 0 4px;
background-color: #0077BC;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
padding: 1px 5px; font-size: 12px;
margin: 0 4px; line-height: 14px;
font-weight: bold; font-weight: bold;
background-color: #0077BC; cursor: pointer;
} }
.diapo div.title { .diapo div.title {
@@ -628,11 +630,6 @@ div.diapo {
color: #aaaaaa; color: #aaaaaa;
} }
#idFrameT .tools .classicButton button.btn-inverse img,
#idFrameT .tools .dropdownButton button.btn-inverse img {
margin: 0 2px;
}
#idFrameT .tools .classicButton button.btn-inverse:hover, #idFrameT .tools .classicButton button.btn-inverse:hover,
#idFrameT .tools .dropdownButton button.btn-inverse:hover { #idFrameT .tools .dropdownButton button.btn-inverse:hover {
background-color: #393939; background-color: #393939;
@@ -640,6 +637,11 @@ div.diapo {
color: #ffffff; color: #ffffff;
} }
#idFrameT .tools .classicButton button.btn-inverse img,
#idFrameT .tools .dropdownButton button.btn-inverse img {
margin: 0 2px;
}
#idFrameT .tools .dropdown-menu { #idFrameT .tools .dropdown-menu {
min-width: 95px; min-width: 95px;
background-color: #393939; background-color: #393939;
@@ -1065,7 +1067,7 @@ form.phrasea_query input.query {
.phrasea_query .field_filter.danger, .phrasea_query .field_filter.danger,
.phrasea_query .status_filter.danger { .phrasea_query .status_filter.danger {
border-color: #c9c900; border-color: #c9c900;
background-color: #FFFDDA; background-color: #FCEC98;
color: #000000; color: #000000;
} }
@@ -1390,7 +1392,7 @@ input:radio, input:checkbox, .checkbox {
input.btn-mini { input.btn-mini {
margin: 0 2px; margin: 0 2px;
height: 12px; height: 12px;
width: 11px; width: 9px;
cursor: default; cursor: default;
font-size: 12px; font-size: 12px;
} }
@@ -1456,8 +1458,26 @@ input.btn-mini {
width: 98%; width: 98%;
} }
#notification_trigger .counter {
position: relative;
top: -2px;
margin: 0 2px;
padding: 1px 4px;
background: none repeat scroll 0 0 red;
background-color: #DA4F49;
background-repeat: repeat-x;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border-style: solid;
border-width: 1px;
border-radius: 4px 4px 4px 4px;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
font-size: 12px;
font-weight: bold;
line-height: 14px;
text-align: center;
color: #FFFFFF;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
@@ -3473,7 +3493,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
} }
.ui-dialog-content label { .ui-dialog-content label {
line-height: 26px; line-height: 18px;
} }
.ui-dialog-content p { .ui-dialog-content p {
@@ -3514,8 +3534,89 @@ dans l'onglet thesaurus : arbres, menus contextuels
font-style: normal; font-style: normal;
} }
#publicator_selection {
height: 190px;
bottom: auto;
background-color: #404040;
}
#publicator_selection > .PNB10 {
overflow: auto;
bottom: 50px;
background-color: #111111;
}
#publicator_selection .btn {
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px;
font-weight: bold;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
#publicator_selection .btn-inverse {
*background-color: #393939;
background-image: -ms-linear-gradient(top, #444444, #393939);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#393939));
background-image: -webkit-linear-gradient(top, #444444, #393939);
background-image: -o-linear-gradient(top, #444444, #393939);
background-image: -moz-linear-gradient(top, #444444, #393939);
background-image: linear-gradient(top, #444444, #393939);
/*border: 1px solid #515151;*/
color: #aaaaaa;
}
#publicator_selection .btn-inverse:hover {
background-color: #393939;
*background-color: #393939;
color: #ffffff;
}
#pub_tabs .btn {
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px;
font-weight: bold;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
#pub_tabs .btn-inverse {
/*border: 1px solid #515151;*/
color: #AAAAAA;
}
#pub_tabs .btn-inverse:hover {
color: #FFFFFF;
}
#pub_tabs .btn-group.open .btn-inverse.dropdown-toggle {
background-color: #222222;
background-image: none;
}
#pub_tabs .container { #pub_tabs .container {
background-color:#111111; width: 660px;
background-color: #000000;
color: #FFFFFF;
}
#pub_tabs .container .blockmenu .dropdown-menu {
background-clip: padding-box;
background-color: transparent;
border: none;
border-radius: 0;
box-shadow: none;
float: left;
left: 0;
list-style: none outside none;
margin: 0;
min-width: 160px;
padding: 0;
position: absolute;
top: 100%;
z-index: 1000;
} }
#dialog_publicator .ui-tabs .ui-tabs-panel.loading { #dialog_publicator .ui-tabs .ui-tabs-panel.loading {
@@ -3564,33 +3665,51 @@ dans l'onglet thesaurus : arbres, menus contextuels
} }
#dialog_publicator .api_banner { #dialog_publicator .api_banner {
height:30px; height: 30px;
bottom: auto;
background-color: #414141;
}
#dialog_publicator .api_banner button {
border: 1px solid #515151;
background-color: #404040;
}
#dialog_publicator .api_banner .submenu.ui-buttonset {
z-index: 600;
}
#dialog_publicator .api_content {
top: 30px;
bottom: 25px;
}
#dialog_publicator .api_content .blockresponse {
padding: 0 10px;
top: 40px;
overflow: auto;
}
#dialog_publicator .api_content .blockmenu {
height:100%;
bottom:auto; bottom:auto;
background-color:#414141; overflow:hidden;
background-repeat: repeat-x;
background-position: left bottom;
} }
#dialog_publicator .api_content .blockmenu a.selected, #dialog_publicator .api_content .blockmenu a.selected,
#dialog_publicator .api_banner a.selected { #dialog_publicator .api_banner a.selected {
font-weight:bold; font-weight: bold;
color:#0099CC; color: #0099CC;
}
#dialog_publicator .api_content {
top:30px;
bottom:25px;
} }
#dialog_publicator .api_infos { #dialog_publicator .api_infos {
top:auto; top: auto;
height:25px; height: 25px;
background-image: url('/skins/icons/api_info.png'); background-image: url('/skins/icons/api_info.png');
background-repeat: repeat-x; background-repeat: repeat-x;
background-position:0 0; background-position: 0 0;
}
#dialog_publicator .api_content .blockmenu
{
background-repeat: repeat-x;
background-position:left bottom;
} }
#dialog_publicator .main_menu { #dialog_publicator .main_menu {
@@ -3626,6 +3745,10 @@ dans l'onglet thesaurus : arbres, menus contextuels
overflow:hidden; overflow:hidden;
} }
#ul_main_pub_tabs {
margin-top: -1px;
}
#ul_main_pub_tabs li { #ul_main_pub_tabs li {
padding-left:20px; padding-left:20px;
background-repeat: no-repeat; background-repeat: no-repeat;
@@ -3719,25 +3842,26 @@ dans l'onglet thesaurus : arbres, menus contextuels
background-color: #212121; background-color: #212121;
} }
#dialog_publicator .api_banner button { #dialog_publicator .api_content .element {
border:1px solid #515151; padding:5px;
background-color : #404040;
} }
#dialog_publicator .api_banner .submenu.ui-buttonset { #dialog_publicator .api_content .element.odd {
z-index:600; background-color: #414141;
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
} }
#dialog_publicator .api_content .element{ #dialog_publicator .api_content .element.even {
padding:5px; background-color: #666666;
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
} }
#dialog_publicator .api_content .element.odd{ #dialog_publicator .api_content .element.selected {
background-color:#2a2a2a; background-color: #999999;
}
#dialog_publicator .api_content .element.selected{
background-color:#666666;
} }
.ui-selectable-helper { .ui-selectable-helper {

View File

@@ -535,14 +535,16 @@ span.ww_winTitle {
} }
#tool_navigate a { #tool_navigate a {
cursor: pointer; padding: 1px 5px;
margin: 0 4px;
background-color: #0077BC;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
padding: 1px 5px; font-size: 12px;
margin: 0 4px; line-height: 14px;
font-weight: bold; font-weight: bold;
background-color: #0077BC; cursor: pointer;
} }
@@ -651,11 +653,6 @@ div.diapo {
padding-left: 5px; padding-left: 5px;
} }
#idFrameT .tools .classicButton button.btn-inverse img,
#idFrameT .tools .dropdownButton button.btn-inverse img {
margin: 0 2px;
}
#idFrameT .tools .classicButton button.btn-inverse:hover, #idFrameT .tools .classicButton button.btn-inverse:hover,
#idFrameT .tools .dropdownButton button.btn-inverse:hover { #idFrameT .tools .dropdownButton button.btn-inverse:hover {
background-color: #A4A4A4; background-color: #A4A4A4;
@@ -663,6 +660,11 @@ div.diapo {
color: #FFFFFF; color: #FFFFFF;
} }
#idFrameT .tools .classicButton button.btn-inverse img,
#idFrameT .tools .dropdownButton button.btn-inverse img {
margin: 0 2px;
}
#idFrameT .tools .dropdown-menu { #idFrameT .tools .dropdown-menu {
min-width: 95px; min-width: 95px;
background-color: #A4A4A4; background-color: #A4A4A4;
@@ -1098,21 +1100,18 @@ form.phrasea_query input.query {
.phrasea_query input.danger, .phrasea_query input.danger,
.phrasea_query .date_filter.danger, .phrasea_query .date_filter.danger,
.phrasea_query .field_filter.danger, .phrasea_query .field_filter.danger,
.phrasea_query .status_filter.danger .phrasea_query .status_filter.danger {
{ border-color: #c9c900;
border-color:#c9c900; background-color: #FCEC98;
background-color:#FFFDDA; color: #000000;
color:#000000;
} }
#adv_search table.colllist #adv_search table.colllist {
{ width: 290px;
width:290px;
} }
#adv_search table.filterlist #adv_search table.filterlist {
{ width: 600px;
width:600px;
} }
.history-validate, .history-push .history-validate, .history-push
@@ -1419,7 +1418,7 @@ input:radio, input:checkbox, .checkbox {
input.btn-mini { input.btn-mini {
margin: 0 2px; margin: 0 2px;
height: 12px; height: 12px;
width: 11px; width: 9px;
cursor: default; cursor: default;
font-size: 12px; font-size: 12px;
} }
@@ -1489,6 +1488,26 @@ input.btn-mini {
} }
#notification_trigger .counter {
position: relative;
top: -2px;
margin: 0 2px;
padding: 1px 4px;
background: none repeat scroll 0 0 red;
background-color: #DA4F49;
background-repeat: repeat-x;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border-style: solid;
border-width: 1px;
border-radius: 4px 4px 4px 4px;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
font-size: 12px;
font-weight: bold;
line-height: 14px;
text-align: center;
color: #FFFFFF;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
@@ -3583,7 +3602,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
} }
.ui-dialog-content label{ .ui-dialog-content label{
line-height:26px; line-height:18px;
} }
.ui-dialog-content p{ .ui-dialog-content p{
@@ -3624,29 +3643,129 @@ dans l'onglet thesaurus : arbres, menus contextuels
font-style: normal; font-style: normal;
} }
#pub_tabs .container{ #publicator_selection {
background-color:#111111; height: 190px;
bottom: auto;
background-color: #B1B1B1;
} }
#dialog_publicator .ui-tabs .ui-tabs-panel.loading{ #publicator_selection > .PNB10 {
background-image:url('/skins/icons/loader000.gif'); overflow: auto;
background-position:center center; bottom: 50px;
background-repeat:no-repeat; background-color: #D9D9D9;
} }
#dialog_publicator .diapo.ui-selected{ #publicator_selection .btn {
background-color:#404040 ; font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px;
font-weight: bold;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
} }
#dialog_publicator .diapo.ui-selecting{ #publicator_selection .btn-inverse {
background-color:#202020 ; background-color: #B1B1B1;
*background-color: #B1B1B1;
background-image: -ms-linear-gradient(top, #B9B9B9, #A4A4A4);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B9B9B9), to(#A4A4A4));
background-image: -webkit-linear-gradient(top, #B9B9B9, #A4A4A4);
background-image: -o-linear-gradient(top, #B9B9B9, #A4A4A4);
background-image: -moz-linear-gradient(top, #B9B9B9, #A4A4A4);
background-image: linear-gradient(top, #B9B9B9, #A4A4A4);
/*border: 1px solid #666666;*/
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#B9B9B9', endColorstr='#A4A4A4', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
color: #EAEAEA;
} }
#ul_main_pub_tabs{ #publicator_selection .btn-inverse:hover {
width:200px; background-color: #A4A4A4;
position:absolute; *background-color: #A4A4A4;
overflow:hidden; color: #FFFFFF;
right:auto; }
#pub_tabs .btn {
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px;
font-weight: bold;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
#pub_tabs .btn-inverse {
background-color: #D6D6D6;
*background-color: #D6D6D6;
background-image: -ms-linear-gradient(top, #FFFFFF, #D6D6D6);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#FFFFFF), to(#D6D6D6));
background-image: -webkit-linear-gradient(top, #FFFFFF, #D6D6D6);
background-image: -o-linear-gradient(top, #FFFFFF, #D6D6D6);
background-image: linear-gradient(top, #FFFFFF, #D6D6D6);
background-image: -moz-linear-gradient(top, #FFFFFF, #D6D6D6);
border-color: #D6D6D6 #D6D6D6 #bfbfbf;
border-bottom-color: #b3b3b3;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#D6D6D6', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
/*border: 1px solid #666666;*/
text-shadow: none;
color: #777777;
}
#pub_tabs .btn-inverse:hover {
background-color: #D6D6D6;
*background-color: #D6D6D6;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
color: #FFFFFF;
}
#pub_tabs .btn-group.open .btn-inverse.dropdown-toggle {
background-color: #E6E6E6;
background-image: none;
}
#pub_tabs .container {
width: 660px;
background-color: #D9D9D9;
color: #FFFFFF;
}
#pub_tabs .container .blockmenu .dropdown-menu {
background-clip: padding-box;
background-color: transparent;
border: none;
border-radius: 0;
box-shadow: none;
float: left;
left: 0;
list-style: none outside none;
margin: 0;
min-width: 160px;
padding: 0;
position: absolute;
top: 100%;
z-index: 1000;
}
#dialog_publicator .ui-tabs .ui-tabs-panel.loading {
background-image: url('/skins/icons/loader000.gif');
background-position: center center;
background-repeat: no-repeat;
}
#dialog_publicator .diapo.ui-selected {
background-color: #404040;
}
#dialog_publicator .diapo.ui-selecting {
background-color: #202020;
}
#ul_main_pub_tabs {
width: 200px;
position: absolute;
overflow: hidden;
right: auto;
} }
#dialog_publicator .ui-tabs-panel{ #dialog_publicator .ui-tabs-panel{
@@ -3672,38 +3791,55 @@ dans l'onglet thesaurus : arbres, menus contextuels
background-color: orange; background-color: orange;
} }
#dialog_publicator .api_banner{ #dialog_publicator .api_banner {
height:30px; height: 30px;
bottom: auto;
background-color: #B1B1B1;
}
#dialog_publicator .api_banner button {
border: 1px solid #515151;
background-color: #404040;
}
#dialog_publicator .api_banner .submenu.ui-buttonset {
z-index: 600;
}
#dialog_publicator .api_content {
top: 30px;
bottom: 25px;
}
#dialog_publicator .api_content .blockresponse {
padding: 0 10px;
top: 40px;
overflow: auto;
}
#dialog_publicator .api_content .blockmenu {
height:100%;
bottom:auto; bottom:auto;
background-color:#414141; overflow:hidden;
background-repeat: repeat-x;
background-position: left bottom;
} }
#dialog_publicator .api_content .blockmenu a.selected, #dialog_publicator .api_content .blockmenu a.selected,
#dialog_publicator .api_banner a.selected{ #dialog_publicator .api_banner a.selected {
font-weight:bold; font-weight: bold;
color:#0099CC; color: #0099CC;
} }
#dialog_publicator .api_content{ #dialog_publicator .api_infos {
top:30px; top: auto;
bottom:25px; height: 25px;
}
#dialog_publicator .api_infos{
top:auto;
height:25px;
background-image: url('/skins/icons/api_info.png'); background-image: url('/skins/icons/api_info.png');
background-repeat: repeat-x; background-repeat: repeat-x;
background-position:0 0; background-position: 0 0;
} }
#dialog_publicator .api_content .blockmenu #dialog_publicator .main_menu {
{
background-repeat: repeat-x;
background-position:left bottom;
}
#dialog_publicator .main_menu{
float:left; float:left;
} }
@@ -3736,25 +3872,25 @@ dans l'onglet thesaurus : arbres, menus contextuels
overflow:hidden; overflow:hidden;
} }
#ul_main_pub_tabs li #ul_main_pub_tabs {
{ margin-top: -1px;
padding-left:20px; }
#ul_main_pub_tabs li {
padding-left: 20px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 6px center; background-position: 6px center;
} }
#ul_main_pub_tabs li.bridge_Youtube #ul_main_pub_tabs li.bridge_Youtube {
{
background-image:url('/skins/icons/youtube-small.gif'); background-image:url('/skins/icons/youtube-small.gif');
} }
#ul_main_pub_tabs li.bridge_Dailymotion #ul_main_pub_tabs li.bridge_Dailymotion {
{
background-image:url('/skins/icons/dailymotion-small.gif'); background-image:url('/skins/icons/dailymotion-small.gif');
} }
#ul_main_pub_tabs li.bridge_Flickr #ul_main_pub_tabs li.bridge_Flickr {
{
background-image:url('/skins/icons/flickr-small.gif'); background-image:url('/skins/icons/flickr-small.gif');
} }
@@ -3850,18 +3986,27 @@ dans l'onglet thesaurus : arbres, menus contextuels
z-index:600; z-index:600;
} }
#dialog_publicator .api_content .element{ #dialog_publicator .api_content .element {
padding:5px; padding:5px;
} }
#dialog_publicator .api_content .element.odd{ #dialog_publicator .api_content .element.odd {
background-color:#2a2a2a; background-color: #414141;
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
} }
#dialog_publicator .api_content .element.selected{ #dialog_publicator .api_content .element.even {
background-color:#666666; background-color: #666666;
-webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
-moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
} }
#dialog_publicator .api_content .element.selected {
background-color: #999999;
}
.ui-selectable-helper{ .ui-selectable-helper{
border:1px dotted #CCCCCC; border:1px dotted #CCCCCC;

View File

@@ -40,20 +40,30 @@
} }
#BasketBrowser .result td.thumbnail{ #BasketBrowser .result td.thumbnail{
text-align:center; display: table-cell;
width:105px; width: 105px;
height: 80px;
padding: 0;
border: none;
border-radius: 0;
box-shadow: none;
line-height: 18px;
text-align: center;
} }
#BasketBrowser .result td.thumbnail .counter{ #BasketBrowser .result td.thumbnail .counter{
bottom: 20px; bottom: 18px;
font-size: 14px; font-size: 14px;
position: relative; position: relative;
right: 10px; right: 5px;
text-align: right; text-align: right;
} }
#BasketBrowser .result td.content{ #BasketBrowser .result td.content{
width:390px; width:390px;
vertical-align:top; vertical-align:top;
} }
#BasketBrowser .results .result h1.title{ #BasketBrowser .results .result h1.title{
font-size:14px; font-size:14px;
} }