diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig
index 4764bf0c3e..0969a4f937 100644
--- a/templates/web/admin/index.html.twig
+++ b/templates/web/admin/index.html.twig
@@ -75,7 +75,7 @@
{% endif %}
-
+
diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig
index 72fad4c793..e6450ea02f 100644
--- a/templates/web/prod/WorkZone/Macros.html.twig
+++ b/templates/web/prod/WorkZone/Macros.html.twig
@@ -199,7 +199,8 @@
{% if story.getId() == selected_id and selected_type == 'story' %}active{% endif %}">
diff --git a/templates/web/prod/WorkZone/Story.html.twig b/templates/web/prod/WorkZone/Story.html.twig
index 8b57ec477a..651354f209 100644
--- a/templates/web/prod/WorkZone/Story.html.twig
+++ b/templates/web/prod/WorkZone/Story.html.twig
@@ -2,6 +2,8 @@
{% set story_length = Story.get_children().get_elements()|length %}
+
+
diff --git a/templates/web/prod/results/item.html.twig b/templates/web/prod/results/item.html.twig
index 1e3f0195cc..7331c1e39c 100644
--- a/templates/web/prod/results/item.html.twig
+++ b/templates/web/prod/results/item.html.twig
@@ -55,10 +55,10 @@
{% set l_width = 30 %}
{% if rollover_thumbnail == 'preview' %}
- {% set l_width = l_width + 20 %}
+ {% set l_width = l_width + 50 %}
{% endif %}
{% if technical_display == '1' %}
- {% set l_width = l_width + 20 %}
+ {% set l_width = l_width + 50 %}
{% endif %}
{% if record.has_preview and has_access_subdef(record, 'preview') %}
diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig
index 62b5aa982b..5d2d6a31bf 100644
--- a/templates/web/prod/results/record.html.twig
+++ b/templates/web/prod/results/record.html.twig
@@ -61,9 +61,9 @@
{% set l_width = 30 %}
{% if settings.rollover_thumbnail == 'preview' %}
- {% set l_width = l_width + 20 %}
+ {% set l_width = l_width + 50 %}
{% elseif settings.technical_display == '1' %}
- {% set l_width = l_width + 20 %}
+ {% set l_width = l_width + 50 %}
{% endif %}
{# drop down options #}
diff --git a/www/skins/icons/sprite_paginate_hover.png b/www/skins/icons/sprite_paginate_hover.png
new file mode 100644
index 0000000000..e3ff67fac0
Binary files /dev/null and b/www/skins/icons/sprite_paginate_hover.png differ
diff --git a/www/skins/icons/story.png b/www/skins/icons/story.png
new file mode 100644
index 0000000000..58e84a6e07
Binary files /dev/null and b/www/skins/icons/story.png differ
diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index 718e664dc2..56f2e4081b 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -215,6 +215,7 @@ span.ww_winTitle {
#idFrameC {
top: 0 !important;
min-width: 300px;
+ bottom: 0 !important;
}
#idFrameC.closed {
@@ -360,12 +361,18 @@ span.ww_winTitle {
}
.treeview>li.expandable {
- height: 50px;
+ min-height: 50px;
line-height: 50px;
vertical-align: middle;
position: relative;
- border-left: 5px #884c93 solid;
background: none;
+ padding-top: 0;
+ padding-bottom: 0;
+}
+
+.treeview>li.expandable>.hitarea {
+ height: 50px;
+ border-left: 5px #884c93 solid;
}
.treeviewul li {
@@ -817,10 +824,11 @@ div.diapo {
#answers_status{
position: absolute;
- bottom: 10px;
+ bottom: 0px;
left: 10px;
height: 60px;
width: 400px;
+ z-index: 1000;
}
#answers_status table{
@@ -4725,19 +4733,34 @@ ui-dialog-titlebar {
}
#paginate #tool_navigate #NEXT_PAGE {
- background: url('../../icons/sprite_paginate.png') -82px 20px no-repeat;
+ background: url('../../icons/sprite_paginate.png') -72px 20px no-repeat;
+ width: 49px;
+ border-left: 1px solid #3b3b3b;
}
#paginate #tool_navigate #PREV_PAGE {
- background: url('../../icons/sprite_paginate.png') -39px 20px no-repeat;
+ background: url('../../icons/sprite_paginate.png') -29px 20px no-repeat;
+ width: 49px;
+ border-right: 1px solid #3b3b3b;
}
#paginate #tool_navigate #last {
- background: url('../../icons/sprite_paginate.png') -131px 20px no-repeat;
+ background: url('../../icons/sprite_paginate.png') -121px 20px no-repeat;
+ width: 49px;
+ border-left: 1px solid #3b3b3b;
}
#paginate #tool_navigate #first {
- background: url('../../icons/sprite_paginate.png') 11px 20px no-repeat;
+ background: url('../../icons/sprite_paginate.png') 21px 20px no-repeat;
+ width: 49px;
+ border-right: 1px solid #3b3b3b;
+}
+
+#paginate #tool_navigate #NEXT_PAGE:hover,
+#paginate #tool_navigate #PREV_PAGE:hover,
+#paginate #tool_navigate #last:hover,
+#paginate #tool_navigate #first:hover {
+ background-image: url('../../icons/sprite_paginate_hover.png');
}
diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css
index e2e5f6d262..fc65889eec 100644
--- a/www/skins/prod/959595/prodcolor.css
+++ b/www/skins/prod/959595/prodcolor.css
@@ -214,6 +214,7 @@ span.ww_winTitle {
#idFrameC {
top: 0 !important;
min-width: 300px;
+ bottom: 0!important;
}
#idFrameC.closed {
@@ -359,7 +360,6 @@ span.ww_winTitle {
}
.treeview>li.expandable {
- height: 50px;
line-height: 50px;
vertical-align: middle;
position: relative;
@@ -842,10 +842,11 @@ div.diapo {
#answers_status {
position: absolute;
- bottom: 10px;
+ bottom: 0px;
left: 10px;
height: 60px;
width: 400px;
+ z-index: 1000;
}
#answers_status table{
@@ -4725,7 +4726,7 @@ ui-dialog-titlebar {
}
#paginate #tool_navigate {
- background-color: #141414;
+ background-color: #D9D9D9;
/*border: 1px solid #3b3b3b;*/
}
@@ -4733,31 +4734,46 @@ ui-dialog-titlebar {
#paginate #tool_navigate #PREV_PAGE:hover,
#paginate #tool_navigate #last:hover,
#paginate #tool_navigate #first:hover {
- background-color: #076882;
+ background-color: #999;
}
#paginate #tool_navigate #NEXT_PAGE {
- background: url('../../icons/sprite_paginate.png') -82px 20px no-repeat;
+ background: url('../../icons/sprite_paginate.png') -72px 20px no-repeat;
+ width: 49px;
+ border-left: 1px solid #999;
}
#paginate #tool_navigate #PREV_PAGE {
- background: url('../../icons/sprite_paginate.png') -39px 20px no-repeat;
+ background: url('../../icons/sprite_paginate.png') -29px 20px no-repeat;
+ width: 49px;
+ border-right: 1px solid #999;
}
#paginate #tool_navigate #last {
- background: url('../../icons/sprite_paginate.png') -131px 20px no-repeat;
+ background: url('../../icons/sprite_paginate.png') -121px 20px no-repeat;
+ width: 49px;
+ border-left: 1px solid #999;
}
#paginate #tool_navigate #first {
- background: url('../../icons/sprite_paginate.png') 11px 20px no-repeat;
+ background: url('../../icons/sprite_paginate.png') 21px 20px no-repeat;
+ width: 49px;
+ border-right: 1px solid #999;
+}
+
+#paginate #tool_navigate #NEXT_PAGE:hover,
+#paginate #tool_navigate #PREV_PAGE:hover,
+#paginate #tool_navigate #last:hover,
+#paginate #tool_navigate #first:hover {
+ background-image: url('../../icons/sprite_paginate_hover.png');
}
#paginate #tool_navigate input,
#paginate #tool_navigate a {
border: none;
- border-top: 1px solid #3b3b3b;
- border-bottom: 1px solid #3b3b3b;
+ border-top: 1px solid #999;
+ border-bottom: 1px solid #999;
padding: 0;
margin: 0;
border-radius: 0;
@@ -4769,19 +4785,19 @@ ui-dialog-titlebar {
font-weight: normal;
text-shadow: none;
box-shadow: none;
- color: #3b3b3b;
+ color: #999;
}
#paginate #tool_navigate:first-child {
- border-left: 1px solid #3b3b3b;
+ border-left: 1px solid #999;
}
#paginate #tool_navigate:last-child {
- border-right: 1px solid #3b3b3b;
+ border-right: 1px solid #999;
}
#paginate #tool_navigate input,
#paginate #tool_navigate a:hover {
color: #fff;
- background: #076882;
+ background: #999;
}
diff --git a/www/skins/prod/jquery.main-prod.js b/www/skins/prod/jquery.main-prod.js
index 1b83e4603d..f2de6131c1 100644
--- a/www/skins/prod/jquery.main-prod.js
+++ b/www/skins/prod/jquery.main-prod.js
@@ -1203,8 +1203,10 @@ $(document).ready(function () {
$('#idFrameC').removeClass('closed');
});
+ var previousTab = "";
+
$('#idFrameC #retractableButton').bind('click', function (event) {
-
+
if($('#idFrameC').attr('data-status') != 'closed'){
$('#idFrameC').width(80);
$('#rightFrame').css('left', 80);
@@ -1214,6 +1216,7 @@ $(document).ready(function () {
$('#idFrameC .ui-tabs-nav li').removeClass('ui-state-active');
$('.WZbasketTab').css('background-position', '15px 16px');
$('#idFrameC').addClass('closed');
+ previousTab = $('#idFrameC .icon-menu').find('li.ui-tabs-active');
}else{
$('#idFrameC').width(300);
$('#rightFrame').css('left', 300);
@@ -1222,8 +1225,9 @@ $(document).ready(function () {
$('.ui-resizable-handle, #basket_menu_trigger').show();
$('.WZbasketTab').css('background-position', '9px 16px');
$('#idFrameC').removeClass('closed');
- }
-
+ $('#idFrameC .icon-menu li').first().find('a').trigger('click');
+ $(previousTab).find('a').trigger('click');
+ }
event.stopImmediatePropagation();
//p4.WorkZone.close();
|