From e52259b04fa091af3ed6da5283b18e7e48a47bc4 Mon Sep 17 00:00:00 2001 From: Ysolyne Gresille Date: Thu, 14 Jun 2012 18:20:29 +0200 Subject: [PATCH] forms' skin updated for Editwindow --- .../Bridge/Dailymotion/video_modify.twig | 129 ++++++++--------- .../actions/Bridge/Flickr/photo_modify.twig | 68 +++++---- .../actions/Bridge/Youtube/video_modify.twig | 130 ++++++++---------- templates/web/prod/actions/edit_default.twig | 4 +- www/prod/jquery.edit.js | 2 +- www/skins/prod/000000/prodcolor.css | 42 +++++- www/skins/prod/959595/prodcolor.css | 27 +++- 7 files changed, 211 insertions(+), 191 deletions(-) diff --git a/templates/web/prod/actions/Bridge/Dailymotion/video_modify.twig b/templates/web/prod/actions/Bridge/Dailymotion/video_modify.twig index 290f5727bf..98ebd9f15d 100644 --- a/templates/web/prod/actions/Bridge/Dailymotion/video_modify.twig +++ b/templates/web/prod/actions/Bridge/Dailymotion/video_modify.twig @@ -3,81 +3,72 @@ {% block menu %} - - - - - - + + + + + +
- - {% trans %}Edition de 1 element{% endtrans %} - - {% trans 'boutton::annuler' %} - -
+ + {% trans %}Edition de 1 element{% endtrans %} : + + {% trans 'boutton::annuler' %} + +
{% endblock %} {% block response %}
- - - - - - - - - - - - - - - - - - - - - -
- - - - {{ error_form.display_errors('title', constraint_errors) }} -
- - - - {{ error_form.display_errors('description', constraint_errors) }} -
- - - {% set categories = account.get_api().get_connector.get_category_list() %} - - -
- - - - {{ error_form.display_errors('tags', constraint_errors) }} -
{% trans 'Confidentialite' %} -
- Privé - +
+ +
+ + {{ error_form.display_errors('title', constraint_errors) }}
-
- public - +
+
+ +
+ + {{ error_form.display_errors('description', constraint_errors) }}
-
- - - {% trans 'boutton::annuler' %} + +
+ +
+ {% set categories = account.get_api().get_connector.get_category_list() %} + +
+
+
+ +
+ + {{ error_form.display_errors('tags', constraint_errors) }} +
+
+
+ +
+ + +
+
+
+ + + +
{% endblock %} diff --git a/templates/web/prod/actions/Bridge/Flickr/photo_modify.twig b/templates/web/prod/actions/Bridge/Flickr/photo_modify.twig index bc5697ff71..e4b8668453 100644 --- a/templates/web/prod/actions/Bridge/Flickr/photo_modify.twig +++ b/templates/web/prod/actions/Bridge/Flickr/photo_modify.twig @@ -3,45 +3,41 @@ {% block menu %} - - - - - - + + + + + +
- - {% trans %}Edition de 1 element{% endtrans %} - - {% trans 'boutton::annuler' %} - -
+ + {% trans %}Edition de 1 element{% endtrans %} : + + {% trans 'boutton::annuler' %} + +
{% endblock %} {% block response %} -
- - - - - - - - - -
- - - - {{ error_form.display_errors('title', constraint_errors) }} -
- - - - {{ error_form.display_errors('description', constraint_errors) }} -
- - - {% trans 'boutton::annuler' %} + +
+ +
+ + {{ error_form.display_errors('title', constraint_errors) }} +
+
+
+ +
+ + {{ error_form.display_errors('description', constraint_errors) }} +
+
+
+ + + +
{% endblock %} diff --git a/templates/web/prod/actions/Bridge/Youtube/video_modify.twig b/templates/web/prod/actions/Bridge/Youtube/video_modify.twig index 0e0dbf5bbd..2a84b8097c 100644 --- a/templates/web/prod/actions/Bridge/Youtube/video_modify.twig +++ b/templates/web/prod/actions/Bridge/Youtube/video_modify.twig @@ -3,80 +3,72 @@ {% block menu %} - - - - - - + + + + + +
- - {% trans %}Edition de 1 element{% endtrans %} - - {% trans 'boutton::annuler' %} - -
+ + {% trans %}Edition de 1 element{% endtrans %} : + + {% trans 'boutton::annuler' %} + +
{% endblock %} {% block response %} -
- - - - - - - - - - - - - - - - - - - - - -
- - - - {{ error_form.display_errors('title', constraint_errors) }} -
- - - - {{ error_form.display_errors('description', constraint_errors) }} -
- - - - {{ error_form.display_errors('tags', constraint_errors) }} -
- - - {% set categorie = account.get_api().get_connector.get_category_list() %} - -
{% trans 'Confidentialite' %} -
- Privé - + +
+ +
+ +

{{ error_form.display_errors('title', constraint_errors) }}

-
- public - +
+
+ +
+ +

{{ error_form.display_errors('description', constraint_errors) }}

-
- - - {% trans 'boutton::annuler' %} + +
+ +
+ +

{{ error_form.display_errors('tags', constraint_errors) }}

+
+
+
+ +
+ {% set categorie = account.get_api().get_connector.get_category_list() %} + +
+
+
+ +
+ + +
+
+
+ + + +
{% endblock %} diff --git a/templates/web/prod/actions/edit_default.twig b/templates/web/prod/actions/edit_default.twig index 97449f4fde..3c074ccdf4 100644 --- a/templates/web/prod/actions/edit_default.twig +++ b/templates/web/prod/actions/edit_default.twig @@ -375,9 +375,9 @@ diff --git a/www/prod/jquery.edit.js b/www/prod/jquery.edit.js index e64e2d34a0..96866d0fac 100644 --- a/www/prod/jquery.edit.js +++ b/www/prod/jquery.edit.js @@ -1513,7 +1513,7 @@ function preset_copy() { var c = p4.edit.T_fields[i]._value == "" ? "" : "checked=\"1\""; var v = p4.edit.T_fields[i]._value; - html += "
"; + html += "
"; html += cleanTags(p4.edit.T_fields[i]._value) + "
"; } } diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 23975c42b7..8300f1bc3e 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -2343,7 +2343,7 @@ DIV.thesaurus U.w { left: 0; bottom: 0; width: 100%; - height: 24px; + height: 28px; overflow: hidden; text-align: center; } @@ -2445,6 +2445,20 @@ DIV.thesaurus U.w { z-index: 10; } +#Edit_copyPreset_dlg form span { + color: #FFFFFF; +} + +.Edit_preset_item { + position: relative; + top: 0px; + left: 0px; + width: 550px; + height: 250px; + overflow: auto; + color: #999999; +} + #TH_Oreplace .btn, #TH_Opresets .btn { margin-bottom: 20px; @@ -3445,12 +3459,7 @@ dans l'onglet thesaurus : arbres, menus contextuels #dialog_publicator .api_content { top: 30px; bottom: 25px; -} - -#dialog_publicator .api_content .blockresponse { - padding: 0 10px; - top: 40px; - overflow: auto; + color: #FFFFFF; } #dialog_publicator .api_content .blockmenu { @@ -3467,12 +3476,26 @@ dans l'onglet thesaurus : arbres, menus contextuels color: #0088CC; } +#dialog_publicator .api_content .blockresponse { + padding: 0 10px; + top: 40px; + overflow: auto; + z-index: 2000; +} + +#dialog_publicator .api_content .blockresponse .form-actions { + background-color: #000000; + border-top: none; + margin: 0; +} + #dialog_publicator .api_infos { top: auto; height: 25px; background-image: url('/skins/icons/api_info.png'); background-repeat: repeat-x; background-position: 0 0; + color: #999999; } #dialog_publicator .main_menu { @@ -3608,6 +3631,7 @@ dans l'onglet thesaurus : arbres, menus contextuels #dialog_publicator .api_content .element { padding: 5px; + color: #FFFFFF; } #dialog_publicator .api_content .element.odd { @@ -3628,6 +3652,10 @@ dans l'onglet thesaurus : arbres, menus contextuels background-color: #999999; } +#dialog_publicator .api_content .element table .informations { + width: 296px; +} + .ui-selectable-helper { border: 1px dotted #CCCCCC; z-index: 10000; diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css index 959fe1926d..b5c8202469 100644 --- a/www/skins/prod/959595/prodcolor.css +++ b/www/skins/prod/959595/prodcolor.css @@ -3583,13 +3583,7 @@ dans l'onglet thesaurus : arbres, menus contextuels #dialog_publicator .api_content { top: 30px; bottom: 25px; -} - -#dialog_publicator .api_content .blockresponse { - padding: 0 10px; - top: 40px; - overflow: auto; - z-index: 1000000000; + color: #333333; } #dialog_publicator .api_content .blockmenu { @@ -3606,12 +3600,26 @@ dans l'onglet thesaurus : arbres, menus contextuels color: #0088CC; } +#dialog_publicator .api_content .blockresponse { + padding: 0 10px; + top: 40px; + overflow: auto; + z-index: 2000; +} + +#dialog_publicator .api_content .blockresponse .form-actions { + background-color: #D9D9D9; + border-top: none; + margin: 0; +} + #dialog_publicator .api_infos { top: auto; height: 25px; background-image: url('/skins/icons/api_info.png'); background-repeat: repeat-x; background-position: 0 0; + color: #999999; } #dialog_publicator .main_menu { @@ -3760,6 +3768,7 @@ dans l'onglet thesaurus : arbres, menus contextuels #dialog_publicator .api_content .element { padding: 5px; + color: #FFFFFF; } #dialog_publicator .api_content .element.odd { @@ -3780,6 +3789,10 @@ dans l'onglet thesaurus : arbres, menus contextuels background-color: #999999; } +#dialog_publicator .api_content .element table .informations { + width: 296px; +} + .ui-selectable-helper { border: 1px dotted #CCCCCC; z-index: 10000;