From 316941309ddd6f2dd95ae8266e61928bf6c0c765 Mon Sep 17 00:00:00 2001 From: Ysolyne Gresille Date: Mon, 4 Jun 2012 19:13:05 +0200 Subject: [PATCH] view bugfixes + update skins for Bridge --- .../Phrasea/Controller/Prod/Bridge.php | 1 + .../Prod/Feedback-SendForm.Mustache.html | 51 +-- templates/web/common/menubar.twig | 7 +- templates/web/prod/Baskets/Create.html.twig | 14 +- templates/web/prod/Story/Create.html.twig | 22 +- .../Bridge/Dailymotion/actioncontainers.twig | 47 +-- .../Bridge/Dailymotion/actionelements.twig | 73 +++-- .../Dailymotion/playlist_createcontainer.twig | 4 +- .../Dailymotion/playlist_deleteelement.twig | 4 +- .../Dailymotion/video_deleteelement.twig | 4 +- .../Dailymotion/video_moveinto_playlist.twig | 4 +- .../Bridge/Flickr/actioncontainers.twig | 47 +-- .../actions/Bridge/Flickr/actionelements.twig | 73 +++-- .../Bridge/Flickr/photo_deleteelement.twig | 4 +- .../Flickr/photo_moveinto_photoset.twig | 4 +- .../Flickr/photoset_createcontainer.twig | 4 +- .../Bridge/Flickr/photoset_deleteelement.twig | 4 +- .../Bridge/Youtube/actioncontainers.twig | 47 +-- .../Bridge/Youtube/actionelements.twig | 73 +++-- .../Youtube/playlist_createcontainer.twig | 4 +- .../Youtube/playlist_deleteelement.twig | 4 +- .../prod/actions/Bridge/Youtube/upload.twig | 2 +- .../Bridge/Youtube/video_deleteelement.twig | 4 +- .../Youtube/video_moveinto_playlist.twig | 4 +- .../web/prod/actions/Bridge/disconnected.twig | 55 ++-- .../web/prod/actions/Bridge/element_list.twig | 71 ++--- templates/web/prod/actions/Bridge/index.twig | 29 +- .../web/prod/actions/Bridge/wrapper.twig | 145 +++++---- templates/web/prod/index.html.twig | 18 +- www/prod/docfunction.php | 2 +- www/skins/prod/000000/prodcolor.css | 214 ++++++++++--- www/skins/prod/959595/prodcolor.css | 293 +++++++++++++----- www/skins/prod/Basket.css | 18 +- 33 files changed, 825 insertions(+), 525 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php index ff5be28cef..664c488186 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Bridge.php @@ -98,6 +98,7 @@ class Bridge implements ControllerProviderInterface $connector->reconnect(); } catch (\Exception $e) { + var_dump(get_class($e), $e->getFile(), $e->getLine(), $e->getTraceAsString()); $error_message = $e->getMessage(); } diff --git a/templates/web/Mustache/Prod/Feedback-SendForm.Mustache.html b/templates/web/Mustache/Prod/Feedback-SendForm.Mustache.html index cacc0bbb21..f7657f920b 100644 --- a/templates/web/Mustache/Prod/Feedback-SendForm.Mustache.html +++ b/templates/web/Mustache/Prod/Feedback-SendForm.Mustache.html @@ -1,27 +1,28 @@
- -
- - -
-
- - -
-
- - -
- + +
+ + +
+
+ + +
+
+ +
\ No newline at end of file diff --git a/templates/web/common/menubar.twig b/templates/web/common/menubar.twig index bec44403bf..0a8bf31206 100644 --- a/templates/web/common/menubar.twig +++ b/templates/web/common/menubar.twig @@ -119,14 +119,11 @@ {% trans 'Notifications' %} - - -
+
- + diff --git a/templates/web/prod/Baskets/Create.html.twig b/templates/web/prod/Baskets/Create.html.twig index a2e273e665..4797b84eb3 100644 --- a/templates/web/prod/Baskets/Create.html.twig +++ b/templates/web/prod/Baskets/Create.html.twig @@ -1,13 +1,15 @@
- - + + - - + + - - + {% endif %}

- +

{% endblock %} diff --git a/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.twig b/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.twig index 2bee60eab4..252c2e93fd 100644 --- a/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.twig +++ b/templates/web/prod/actions/Bridge/Youtube/video_deleteelement.twig @@ -20,7 +20,7 @@ {% endfor %} - - + +
{% endblock %} diff --git a/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.twig b/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.twig index b63ea86ec0..3c0a51b712 100644 --- a/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.twig +++ b/templates/web/prod/actions/Bridge/Youtube/video_moveinto_playlist.twig @@ -28,7 +28,7 @@ {% endfor %} - - + + {% endblock %} diff --git a/templates/web/prod/actions/Bridge/disconnected.twig b/templates/web/prod/actions/Bridge/disconnected.twig index 7ce9250702..0508e8662c 100644 --- a/templates/web/prod/actions/Bridge/disconnected.twig +++ b/templates/web/prod/actions/Bridge/disconnected.twig @@ -1,30 +1,29 @@ -
-
-

- {% trans 'Vous etes actuellement deconnecte de votre compte, vous devez vous connecter pour continuer' %} -

- - - - - - - -
-
- - -
- 		-
- {% for key, value in r_parameters %} - - {% endfor %} - -
-
-
+
+

+ {% trans 'Vous etes actuellement deconnecte de votre compte, vous devez vous connecter pour continuer' %} +

+ + + + + + + +
+
+ + +
+ 		+
+ {% for key, value in r_parameters %} + + {% endfor %} + +
+
+
diff --git a/templates/web/prod/actions/Bridge/element_list.twig b/templates/web/prod/actions/Bridge/element_list.twig index 9a8183d75f..d55c6f6427 100644 --- a/templates/web/prod/actions/Bridge/element_list.twig +++ b/templates/web/prod/actions/Bridge/element_list.twig @@ -2,50 +2,43 @@ {% import "prod/actions/Bridge/paginator.twig" as pages %} - {% block menu %} + + + + {% 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 %} -
+
+ + +
+
- - - {% 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 %} - {% include actiontemplate %} - - {% if not elements.get_total_items is none %} - - {% endif %} - - + {% if not elements.get_total_items is none %} + + {% endif %} + +
-
- - -
- 		- - - {% set url = '/prod/bridge/adapter/' ~ account.get_id ~ '/' ~ adapter_action ~ '/' ~ action_type ~ '/' %} - {{pages.paginator(elements.get_total_page(), elements.get_current_page(), url) }} - - -
+ {% set url = '/prod/bridge/adapter/' ~ account.get_id ~ '/' ~ adapter_action ~ '/' ~ action_type ~ '/' %} + {{pages.paginator(elements.get_total_page(), elements.get_current_page(), url) }} +
{% endblock %} {% block response %} {%for element in elements.get_elements%} -
@@ -117,9 +110,9 @@
{% 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' %} - {% 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 %} {% include actiontemplate %} @@ -127,7 +120,5 @@
- - {% endfor %} {% endblock %} diff --git a/templates/web/prod/actions/Bridge/index.twig b/templates/web/prod/actions/Bridge/index.twig index 3a451aa3c7..5f58bbc4dc 100644 --- a/templates/web/prod/actions/Bridge/index.twig +++ b/templates/web/prod/actions/Bridge/index.twig @@ -2,8 +2,8 @@ {% import "common/thumbnail.html" as thumb %}
-
-
+
+
{% for id, record in route.get_elements %}
{{ record.get_title() }}
@@ -12,8 +12,8 @@ {% endfor %}
-
- +
+
@@ -49,9 +49,9 @@ {% if available_apis|length > 0 %} {% for api in available_apis %} {% if api.get_connector().is_configured() %} - -