hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issues Monday + more

Browse Source
This commit is contained in:
Olivier Mayer
2015-03-30 19:28:33 +09:00
parent 998020dbd5
commit 30d9bccbf2
10 changed files with 76 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/admin/index.html.twig
View File

@@ -75,7 +75,7 @@
</div> </div>
{% endif %} {% endif %}
<div class="right PNB" style="left:250px;overflow:auto;"> <div class="right PNB" style="left:250px;overflow:auto;top:25px;">
<div id="right-ajax" class="PNB10 right-view"></div> <div id="right-ajax" class="PNB10 right-view"></div>
</div> </div>
<div id="quotas_dialog"></div> <div id="quotas_dialog"></div>

3
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -199,7 +199,8 @@
{% if story.getId() == selected_id and selected_type == 'story' %}active{% endif %}"> {% if story.getId() == selected_id and selected_type == 'story' %}active{% endif %}">
<a class="workzone-menu-title" href="{{ path('prod_stories_story', { 'sbas_id' : story.getRecord(app).get_sbas_id, 'record_id' : story.getRecord(app).get_record_id() }) }}"> <a class="workzone-menu-title" href="{{ path('prod_stories_story', { 'sbas_id' : story.getRecord(app).get_sbas_id, 'record_id' : story.getRecord(app).get_record_id() }) }}">
<span> <span>
{# story.getRecord(app).get_base_id()|get_collection_logo(app)|raw #} {#{ story.getRecord(app).get_base_id()|get_collection_logo(app)|raw }#}
<img src='/skins/icons/story.png' title=''/>
{{ story.getRecord(app).get_title() }} {{ story.getRecord(app).get_title() }}
</span> </span>
</a> </a>

2
templates/web/prod/WorkZone/Story.html.twig
View File

@@ -2,6 +2,8 @@
{% set story_length = Story.get_children().get_elements()|length %} {% set story_length = Story.get_children().get_elements()|length %}
<div class="tools"> <div class="tools">
<label>Actions</label>
<button class="ui-corner-all TOOL_disktt_btn story_window" title="{{ 'action : exporter' | trans }}"> <button class="ui-corner-all TOOL_disktt_btn story_window" title="{{ 'action : exporter' | trans }}">
<img src="/skins/prod/000000/images/disktt_history.png"/> <img src="/skins/prod/000000/images/disktt_history.png"/>
</button> </button>

4
templates/web/prod/results/item.html.twig
View File

@@ -55,10 +55,10 @@
</td> </td>
{% set l_width = 30 %} {% set l_width = 30 %}
{% if rollover_thumbnail == 'preview' %} {% if rollover_thumbnail == 'preview' %}
{% set l_width = l_width + 20 %} {% set l_width = l_width + 50 %}
{% endif %} {% endif %}
{% if technical_display == '1' %} {% if technical_display == '1' %}
{% set l_width = l_width + 20 %} {% set l_width = l_width + 50 %}
{% endif %} {% endif %}
<td style='text-align:right;width:{{ l_width }}px;' valign='bottom'> <td style='text-align:right;width:{{ l_width }}px;' valign='bottom'>
{% if record.has_preview and has_access_subdef(record, 'preview') %} {% if record.has_preview and has_access_subdef(record, 'preview') %}

4
templates/web/prod/results/record.html.twig
View File

@@ -61,9 +61,9 @@
{% set l_width = 30 %} {% set l_width = 30 %}
{% if settings.rollover_thumbnail == 'preview' %} {% if settings.rollover_thumbnail == 'preview' %}
{% set l_width = l_width + 20 %} {% set l_width = l_width + 50 %}
{% elseif settings.technical_display == '1' %} {% elseif settings.technical_display == '1' %}
{% set l_width = l_width + 20 %} {% set l_width = l_width + 50 %}
{% endif %} {% endif %}
{# drop down options #} {# drop down options #}

BIN
www/skins/icons/sprite_paginate_hover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
www/skins/icons/story.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

37
www/skins/prod/000000/prodcolor.css
View File

@@ -215,6 +215,7 @@ span.ww_winTitle {
#idFrameC { #idFrameC {
top: 0 !important; top: 0 !important;
min-width: 300px; min-width: 300px;
bottom: 0 !important;
} }
#idFrameC.closed { #idFrameC.closed {
@@ -360,12 +361,18 @@ span.ww_winTitle {
} }
.treeview>li.expandable { .treeview>li.expandable {
height: 50px; min-height: 50px;
line-height: 50px; line-height: 50px;
vertical-align: middle; vertical-align: middle;
position: relative; position: relative;
border-left: 5px #884c93 solid;
background: none; background: none;
padding-top: 0;
padding-bottom: 0;
}
.treeview>li.expandable>.hitarea {
height: 50px;
border-left: 5px #884c93 solid;
} }
.treeviewul li { .treeviewul li {
@@ -817,10 +824,11 @@ div.diapo {
#answers_status{ #answers_status{
position: absolute; position: absolute;
bottom: 10px; bottom: 0px;
left: 10px; left: 10px;
height: 60px; height: 60px;
width: 400px; width: 400px;
z-index: 1000;
} }
#answers_status table{ #answers_status table{
@@ -4725,19 +4733,34 @@ ui-dialog-titlebar {
} }
#paginate #tool_navigate #NEXT_PAGE { #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 { #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 { #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 { #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');
} }

44
www/skins/prod/959595/prodcolor.css
View File

@@ -214,6 +214,7 @@ span.ww_winTitle {
#idFrameC { #idFrameC {
top: 0 !important; top: 0 !important;
min-width: 300px; min-width: 300px;
bottom: 0!important;
} }
#idFrameC.closed { #idFrameC.closed {
@@ -359,7 +360,6 @@ span.ww_winTitle {
} }
.treeview>li.expandable { .treeview>li.expandable {
height: 50px;
line-height: 50px; line-height: 50px;
vertical-align: middle; vertical-align: middle;
position: relative; position: relative;
@@ -842,10 +842,11 @@ div.diapo {
#answers_status { #answers_status {
position: absolute; position: absolute;
bottom: 10px; bottom: 0px;
left: 10px; left: 10px;
height: 60px; height: 60px;
width: 400px; width: 400px;
z-index: 1000;
} }
#answers_status table{ #answers_status table{
@@ -4725,7 +4726,7 @@ ui-dialog-titlebar {
} }
#paginate #tool_navigate { #paginate #tool_navigate {
background-color: #141414; background-color: #D9D9D9;
/*border: 1px solid #3b3b3b;*/ /*border: 1px solid #3b3b3b;*/
} }
@@ -4733,31 +4734,46 @@ ui-dialog-titlebar {
#paginate #tool_navigate #PREV_PAGE:hover, #paginate #tool_navigate #PREV_PAGE:hover,
#paginate #tool_navigate #last:hover, #paginate #tool_navigate #last:hover,
#paginate #tool_navigate #first:hover { #paginate #tool_navigate #first:hover {
background-color: #076882; background-color: #999;
} }
#paginate #tool_navigate #NEXT_PAGE { #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 { #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 { #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 { #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 input,
#paginate #tool_navigate a { #paginate #tool_navigate a {
border: none; border: none;
border-top: 1px solid #3b3b3b; border-top: 1px solid #999;
border-bottom: 1px solid #3b3b3b; border-bottom: 1px solid #999;
padding: 0; padding: 0;
margin: 0; margin: 0;
border-radius: 0; border-radius: 0;
@@ -4769,19 +4785,19 @@ ui-dialog-titlebar {
font-weight: normal; font-weight: normal;
text-shadow: none; text-shadow: none;
box-shadow: none; box-shadow: none;
color: #3b3b3b; color: #999;
} }
#paginate #tool_navigate:first-child { #paginate #tool_navigate:first-child {
border-left: 1px solid #3b3b3b; border-left: 1px solid #999;
} }
#paginate #tool_navigate:last-child { #paginate #tool_navigate:last-child {
border-right: 1px solid #3b3b3b; border-right: 1px solid #999;
} }
#paginate #tool_navigate input, #paginate #tool_navigate input,
#paginate #tool_navigate a:hover { #paginate #tool_navigate a:hover {
color: #fff; color: #fff;
background: #076882; background: #999;
} }

10
www/skins/prod/jquery.main-prod.js
View File

@@ -1203,8 +1203,10 @@ $(document).ready(function () {
$('#idFrameC').removeClass('closed'); $('#idFrameC').removeClass('closed');
}); });
var previousTab = "";
$('#idFrameC #retractableButton').bind('click', function (event) { $('#idFrameC #retractableButton').bind('click', function (event) {
if($('#idFrameC').attr('data-status') != 'closed'){ if($('#idFrameC').attr('data-status') != 'closed'){
$('#idFrameC').width(80); $('#idFrameC').width(80);
$('#rightFrame').css('left', 80); $('#rightFrame').css('left', 80);
@@ -1214,6 +1216,7 @@ $(document).ready(function () {
$('#idFrameC .ui-tabs-nav li').removeClass('ui-state-active'); $('#idFrameC .ui-tabs-nav li').removeClass('ui-state-active');
$('.WZbasketTab').css('background-position', '15px 16px'); $('.WZbasketTab').css('background-position', '15px 16px');
$('#idFrameC').addClass('closed'); $('#idFrameC').addClass('closed');
previousTab = $('#idFrameC .icon-menu').find('li.ui-tabs-active');
}else{ }else{
$('#idFrameC').width(300); $('#idFrameC').width(300);
$('#rightFrame').css('left', 300); $('#rightFrame').css('left', 300);
@@ -1222,8 +1225,9 @@ $(document).ready(function () {
$('.ui-resizable-handle, #basket_menu_trigger').show(); $('.ui-resizable-handle, #basket_menu_trigger').show();
$('.WZbasketTab').css('background-position', '9px 16px'); $('.WZbasketTab').css('background-position', '9px 16px');
$('#idFrameC').removeClass('closed'); $('#idFrameC').removeClass('closed');
} $('#idFrameC .icon-menu li').first().find('a').trigger('click');
$(previousTab).find('a').trigger('click');
}
event.stopImmediatePropagation(); event.stopImmediatePropagation();
//p4.WorkZone.close(); //p4.WorkZone.close();