diff --git a/lib/Alchemy/Phrasea/Application/Prod.php b/lib/Alchemy/Phrasea/Application/Prod.php index 9fb4494ed2..05739fb875 100644 --- a/lib/Alchemy/Phrasea/Application/Prod.php +++ b/lib/Alchemy/Phrasea/Application/Prod.php @@ -76,22 +76,22 @@ return call_user_func(function() { if ($e instanceof \Bridge_Exception_ApiConnectorNotConfigured) { $params = array_merge($params, array('account' => $app['current_account'])); - return new response($twig->render('/prod/actions/Bridge/notconfigured.twig', $params), 200); + return new Response($twig->render('/prod/actions/Bridge/notconfigured.twig', $params), 200); } elseif ($e instanceof \Bridge_Exception_ApiConnectorNotConnected) { $params = array_merge($params, array('account' => $app['current_account'])); - return new response($twig->render('/prod/actions/Bridge/disconnected.twig', $params), 200); + return new Response($twig->render('/prod/actions/Bridge/disconnected.twig', $params), 200); } elseif ($e instanceof \Bridge_Exception_ApiConnectorAccessTokenFailed) { $params = array_merge($params, array('account' => $app['current_account'])); - return new response($twig->render('/prod/actions/Bridge/disconnected.twig', $params), 200); + return new Response($twig->render('/prod/actions/Bridge/disconnected.twig', $params), 200); } elseif ($e instanceof \Bridge_Exception_ApiDisabled) { $params = array_merge($params, array('api' => $e->get_api())); - return new response($twig->render('/prod/actions/Bridge/deactivated.twig', $params), 200); + return new Response($twig->render('/prod/actions/Bridge/deactivated.twig', $params), 200); } - return new response($twig->render('/prod/actions/Bridge/error.twig', $params), 200); + return new Response($twig->render('/prod/actions/Bridge/error.twig', $params), 200); } if ($request->getRequestFormat() == 'json') { $datas = array( diff --git a/templates/web/lightbox/validate.twig b/templates/web/lightbox/validate.twig index 2a4a142a3b..a557f06294 100644 --- a/templates/web/lightbox/validate.twig +++ b/templates/web/lightbox/validate.twig @@ -122,11 +122,13 @@ - - {% if basket.getValidation() %} - - {% endif %} - {% for item in baskets_collection %} {% if item.getValidation() %} @@ -144,8 +146,10 @@ {% endfor %} - @@ -156,7 +160,7 @@ -
+
diff --git a/templates/web/prod/actions/Bridge/deactivated.twig b/templates/web/prod/actions/Bridge/deactivated.twig index 6be4d6cfa6..1a508c9c56 100644 --- a/templates/web/prod/actions/Bridge/deactivated.twig +++ b/templates/web/prod/actions/Bridge/deactivated.twig @@ -1,5 +1,5 @@ -
+

{% set name = api.get_connector().get_name() %} diff --git a/templates/web/prod/actions/Bridge/disconnected.twig b/templates/web/prod/actions/Bridge/disconnected.twig index 0508e8662c..937e3784be 100644 --- a/templates/web/prod/actions/Bridge/disconnected.twig +++ b/templates/web/prod/actions/Bridge/disconnected.twig @@ -1,4 +1,4 @@ -

+

{% trans 'Vous etes actuellement deconnecte de votre compte, vous devez vous connecter pour continuer' %} diff --git a/templates/web/prod/actions/Bridge/element_list.twig b/templates/web/prod/actions/Bridge/element_list.twig index d55c6f6427..a4fc0d8d01 100644 --- a/templates/web/prod/actions/Bridge/element_list.twig +++ b/templates/web/prod/actions/Bridge/element_list.twig @@ -29,7 +29,7 @@

--> {% endif %} - + {% set url = '/prod/bridge/adapter/' ~ account.get_id ~ '/' ~ adapter_action ~ '/' ~ action_type ~ '/' %} {{pages.paginator(elements.get_total_page(), elements.get_current_page(), url) }} @@ -40,15 +40,15 @@ {% block response %} {%for element in elements.get_elements%}
- +
-
+ {% if element.get_thumbnail != "" %}
- + {% if element.get_duration != "" %} {{element.get_duration}} diff --git a/templates/web/prod/actions/Bridge/index.twig b/templates/web/prod/actions/Bridge/index.twig index 5f58bbc4dc..99fc6d9e46 100644 --- a/templates/web/prod/actions/Bridge/index.twig +++ b/templates/web/prod/actions/Bridge/index.twig @@ -1,7 +1,7 @@ {% import "common/thumbnail.html" as thumb %} -
+
{% for id, record in route.get_elements %} @@ -116,14 +116,20 @@ $(function() { }); $('.bridge_action', $panel).bind('click', function(){ + var $this = $(this); + $.ajax({ type : 'GET', url : $(this).attr('href'), beforeSend : function(){ - $('.container', $panel).empty().addClass('loading'); + var container = $('.container-bridge', $panel); + container.empty(); + if( ! $this.hasClass('bridge_logout')) { + container.addClass('loading'); + } }, success : function(datas){ - $panel.removeClass('loading').append(datas); + $('.container-bridge', $panel).removeClass('loading').append(datas); panel_load($panel); }, error:function(){ @@ -216,7 +222,7 @@ $(function() { }); - $('button.form_multiple_submitter', $panel).bind('click', function(){ + $('a.form_multiple_submitter', $panel).bind('click', function(){ var $form = $(this).closest('form'); var elements = $('form[name="bridge_selection"] input[name="elements_list"]', $panel).val(); @@ -269,24 +275,22 @@ $(function() { return false; }); - - } pub_tabs.tabs({ load: function(event, ui) { $panel = $(ui.panel); - $('.container', $panel).removeClass('loading'); + $('.container-bridge', $panel).removeClass('loading'); panel_load($panel); } - , panelTemplate : '
' + , panelTemplate : '
' , spinner: 'loading...' ,select: function(event, ui) { if($(ui.tab).hasClass('account')) { - var container = $('.container', ui.panel); + var container = $('.container-bridge', ui.panel); container.empty(); $('.container', ui.panel).addClass('loading'); } diff --git a/templates/web/prod/actions/Bridge/notconfigured.twig b/templates/web/prod/actions/Bridge/notconfigured.twig index 6a2d4168fe..f7439e2afc 100644 --- a/templates/web/prod/actions/Bridge/notconfigured.twig +++ b/templates/web/prod/actions/Bridge/notconfigured.twig @@ -1,5 +1,5 @@ -
+

{% trans 'Le connecteur API requis n\'est pas configure correctement, veuillez contacter un administrateur' %} diff --git a/templates/web/prod/actions/Bridge/wrapper.twig b/templates/web/prod/actions/Bridge/wrapper.twig index 8a1ff8564d..db9428411e 100644 --- a/templates/web/prod/actions/Bridge/wrapper.twig +++ b/templates/web/prod/actions/Bridge/wrapper.twig @@ -1,77 +1,76 @@ -

-
-
- +
+
+
+ + + + + + +
+ {% for type, display_name in account.get_api().get_connector().get_element_types() %} + + {{ display_name }} + + {% if not loop.last %} - {% endif %} + {% endfor %} + | + {% for type, display_name in account.get_api().get_connector().get_container_types() %} + + {{ display_name }} + + {% if not loop.last %} - {% endif %} + {% endfor %} + + {% trans 'Fichiers envoyes' %} + + + {% if account %} + + {% trans 'phraseanet:: deconnection' %} + + {% endif %} +
+
+ +
+
+
+ {% block menu %}{% endblock %} +
+
+
+ {% if error_message %} +
{{ error_message }}
+ {% endif %} + {% if notice_message %} +
{{ notice_message }}
+ {% endif %} + {% block response %}{% endblock %} +
+
+ +
+
+
- {% for type, display_name in account.get_api().get_connector().get_element_types() %} - - {{ display_name }} - - {% if not loop.last %} - {% endif %} - {% endfor %} - | - {% for type, display_name in account.get_api().get_connector().get_container_types() %} - - {{ display_name }} - - {% if not loop.last %} - {% endif %} - {% endfor %} - |  - - {% trans 'Fichiers envoyes' %} - + {% if account.get_api().get_connector().get_terms_url() %} + + {% trans 'Terms of service' %} + + {% endif %} - {% if account %} - - {% trans 'phraseanet:: deconnection' %} + + {{ account.get_api().get_connector().get_infos() }} + - {% endif %}
-
-
-
- {% block menu %}{% endblock %} -
-
-
- {% if error_message %} -
{{ error_message }}
- {% endif %} - {% if notice_message %} -
{{ notice_message }}
- {% endif %} - {% block response %}{% endblock %} -
-
-
-
- - - - - - - -
- {% if account.get_api().get_connector().get_terms_url() %} - - {% trans 'Terms of service' %} - - {% endif %} - - - {{ account.get_api().get_connector().get_infos() }} - - -
-
-
diff --git a/www/prod/publicator.js b/www/prod/publicator.js index 7cf5da7f10..59ac86a776 100644 --- a/www/prod/publicator.js +++ b/www/prod/publicator.js @@ -1,71 +1,18 @@ function publicator_reload_publicator() { - var options = $('#dialog_publicator form[name="current_datas"]').serializeArray(); - - var opts = { - type : 'POST', - url : "/prod/bridge/manager/", - dataType : 'html', - data : options, - beforeSend : function(){ - $('#dialog_publicator').empty().addClass("loading"); - }, - success : function(data){ - publicator_load_datas(data); - }, - error:function(){ - $('#dialog_publicator').removeClass("loading"); - }, - timeout:function(){ - $('#dialog_publicator').removeClass("loading"); - } - } - $.ajax(opts); -} - -function publicator_load_datas(data) -{ - $('#dialog_publicator').removeClass("loading").empty().append(data); - $('#ul_main_pub_tabs li:first a').trigger('click'); + var options = $('#dialog_publicator form[name="current_datas"]').serializeArray(); + var dialog = p4.Dialog.get(1); + dialog.load('/prod/bridge/manager/', 'POST', options); } function init_publicator(datas) { - $.ajax({ - type : 'POST', - url : "/prod/bridge/manager/", - dataType : 'html', - data : datas, - success : function(data){ - var div_publicator = $('#dialog_publicator'); - publicator_dialog(); - publicator_load_datas(data); - }, - error:function(){ + var dialog = p4.Dialog.Create({ + size:'Full', + title:'Bridge', + loading: false + }); - }, - timeout:function(){ - - } - }); -} - - - -function publicator_dialog() -{ - var height = Math.max(bodySize.y - 40, 500); - var div_publicator = $('#dialog_publicator'); - div_publicator.dialog({ - width:900, - height:height, - modal:true, - closeOnEscape : true, - resizable : false, - overlay: { - backgroundColor: '#000', - opacity: 0.7 - } - }).dialog('open'); + dialog.load('/prod/bridge/manager/', 'POST', datas); } diff --git a/www/skins/lightbox/lightbox.css b/www/skins/lightbox/lightbox.css index a9b8407878..b6b5bd479a 100644 --- a/www/skins/lightbox/lightbox.css +++ b/www/skins/lightbox/lightbox.css @@ -19,8 +19,8 @@ a, a:hover, a:visited { color: #BFBFBF; } -#record_infos a, -#record_infos a:hover, +#record_infos a, +#record_infos a:hover, #record_infos a:visited { color: #000000; } @@ -37,11 +37,11 @@ img { } #top_container { - bottom: 186px; + bottom: 190px; } #bottom_container { - height: 196px; + height: 200px; top: auto; bottom: -10px } diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 6bb0be60cd..2c737859bf 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -217,7 +217,6 @@ span.ww_winTitle { #idFrameC .ui-tabs .ui-tabs-nav li { width: auto; - *width: 74px; height: 52px; display: inline-block; background-color: #404040; @@ -3437,24 +3436,28 @@ dans l'onglet thesaurus : arbres, menus contextuels background-image: none; } -#pub_tabs .container { - width: 660px; - background-color: #000000; +#dialog_publicator .dropdown-menu { + min-width: 95px; + background-color: #393939; + *border: 1px solid #515151; +} + +#dialog_publicator .dropdown-menu a { + padding: 3px 10px; + font-size: 12px; + color: #aaaaaa; + cursor: pointer; +} + +#dialog_publicator .dropdown-menu a:hover { + background-color: #313131; color: #FFFFFF; } -#pub_tabs .container .blockmenu .dropdown-menu { - background-color: #000000; - border: 1px solid #404040; -} - -#pub_tabs .container .blockmenu .dropdown-menu a { - color: #EAEAEA; -} - -#pub_tabs .container .blockmenu .dropdown-menu a:hover { - background-color: #0088CC; - color: #FFFFFF; +#dialog_publicator .dropdown-menu .divider { + background-color: #515151; + border-bottom: 1px solid #404040; + margin: 3px 1px 3px 1px; } #dialog_publicator .ui-tabs .ui-tabs-panel.loading { @@ -3523,12 +3526,12 @@ dans l'onglet thesaurus : arbres, menus contextuels } #dialog_publicator .api_content .blockmenu { - height: 100%; bottom: auto; - overflow: hidden; background-repeat: repeat-x; background-position: left bottom; z-index: 1000; + width:100%; + height:40px } #dialog_publicator .api_content .blockmenu a.selected, @@ -3563,30 +3566,6 @@ dans l'onglet thesaurus : arbres, menus contextuels float: left; } -#dialog_publicator .main_menu button { - z-index: 555; - font-size: 13px; - font-weight: normal; -} - -#dialog_publicator .main_menu .submenu button { - width: 145px; - z-index: 555; - background-color: #111; - font-size: 13px; - font-weight: normal; - border-color: #666; -} - -#dialog_publicator .element_menu .submenu button { - width: 145px; - z-index: 555; - background-color: #111; - font-size: 13px; - font-weight: normal; - border-color: #666; -} - #dialog_publicator .diapo .title { height: 16px; overflow: hidden; diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css index 7a00d4f4af..97995c57fe 100644 --- a/www/skins/prod/959595/prodcolor.css +++ b/www/skins/prod/959595/prodcolor.css @@ -217,7 +217,6 @@ span.ww_winTitle { #idFrameC .ui-tabs .ui-tabs-nav li { width: auto; - *width: 74px; height: 52px; display: inline-block; background-color: #999999; @@ -3569,26 +3568,6 @@ dans l'onglet thesaurus : arbres, menus contextuels background-image: none; } -#pub_tabs .container { - width: 660px; - background-color: #D9D9D9; - color: #FFFFFF; -} - -#pub_tabs .container .blockmenu .dropdown-menu { - background-color: #E6E6E6; - border: 1px solid #D9D9D9; -} - -#pub_tabs .container .blockmenu .dropdown-menu a { - color: #333333; -} - -#pub_tabs .container .blockmenu .dropdown-menu a:hover { - background-color: #0088CC; - color: #FFFFFF; -} - #dialog_publicator .ui-tabs .ui-tabs-panel.loading { background-image: url('/skins/icons/loader000.gif'); background-position: center center; @@ -3603,6 +3582,31 @@ dans l'onglet thesaurus : arbres, menus contextuels background-color: #202020; } + +#dialog_publicator .dropdown-menu { + min-width: 95px; + background-color: #A4A4A4; + *border: 1px solid #666666; +} + +#dialog_publicator .dropdown-menu a { + padding: 3px 10px; + font-size: 12px; + color: #EAEAEA; + cursor: pointer; +} + +#dialog_publicator .dropdown-menu a:hover { + background-color: #666666; + color: #FFFFFF; +} + +#dialog_publicator .dropdown-menu .divider { + background-color: #777777; + border-bottom: 1px solid #B0B0B0; + margin: 3px 1px; +} + #ul_main_pub_tabs { width: 200px; position: absolute; @@ -3655,12 +3659,12 @@ dans l'onglet thesaurus : arbres, menus contextuels } #dialog_publicator .api_content .blockmenu { - height: 100%; bottom: auto; - overflow: hidden; background-repeat: repeat-x; background-position: left bottom; z-index: 1000; + width:100%; + height:40px } #dialog_publicator .api_content .blockmenu a.selected, @@ -3691,34 +3695,6 @@ dans l'onglet thesaurus : arbres, menus contextuels color: #999999; } -#dialog_publicator .main_menu { - float: left; -} - -#dialog_publicator .main_menu button { - z-index: 555; - font-size: 13px; - font-weight: normal; -} - -#dialog_publicator .main_menu .submenu button { - width: 145px; - z-index: 555; - background-color: #111; - font-size: 13px; - font-weight: normal; - border-color: #666; -} - -#dialog_publicator .element_menu .submenu button { - width: 145px; - z-index: 555; - background-color: #111; - font-size: 13px; - font-weight: normal; - border-color: #666; -} - #dialog_publicator .diapo .title { height: 16px; overflow: hidden;