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

Merge pull request #1276 from kwemi/design-update-v1

Browse Source 
Design update v1
This commit is contained in:
Nicolas Le Goff
2015-03-10 10:01:01 +01:00
parent 09a2224cdd 496b8b8424
commit 982e0778e4
4 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/web/prod/index.html.twig
View File

@@ -183,11 +183,6 @@
<div class="PNB wrapper">
<div class="tabs ui-tabs">
<ul class="icon-menu ui-tabs-nav ui-helper-reset">
<li class="ui-tabs-selected ui-corner-top">
<a href="#baskets" class="WZbasketTab">
<div id="basket_menu_trigger">&#9660;</div>
</a>
</li>
{% if GV_thesaurus %}
<li class="proposals_WZ">
<a href="#proposals" class="WZtabs">
@@ -206,6 +201,11 @@
<img src="/skins/icons/workzoneEscamote.png" title="{{ 'Close the WorkZone' | trans }}"/>
</a>
</li>
<li class="ui-tabs-selected ui-corner-top">
<a href="#baskets" class="WZbasketTab">
<div id="basket_menu_trigger">&#9660;</div>
</a>
</li>
</ul>
<div id="baskets" class="PNB">
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %}
@@ -509,9 +509,6 @@
</span>
</div>
<!--td class="navigation">
<div id="tool_navigate"></div>
</td-->
</div>
</div>
@@ -756,6 +753,11 @@
});
</script>
</div>
<div id="paginate">
<div class="navigation">
<div id="tool_navigate"></div>
</div>
</div>
</div>
</div>
</div>

2
templates/web/prod/preview/caption.html.twig
View File

@@ -3,7 +3,7 @@
{% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id, 'canmodifrecord') %}
<div class="edit_button" style="text-align:right">
<a href="#" onclick="editThis('IMGT','{{record.get_serialize_key()}}');">
<img style="vertical-align:middle" src="/skins/prod/000000/images/ppen_history.png" />
<img style="vertical-align:middle" src="/skins/prod/000000/images/ppen_history.png" width="16"/>
{{ 'action : editer' | trans }}
</a>
</div>

BIN
www/skins/icons/proposition_off32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

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

@@ -4379,7 +4379,47 @@ ui-dialog-titlebar {
max-heigh: 16px;
}
#answers .status img {
max-width: 16px;
max-heigh: 16px;
}
#paginate {
position: absolute;
bottom: 30px;
right: 65px;
}
#paginate #tool_navigate {
background-color: #000;
/*border: 1px solid #3b3b3b;*/
}
#paginate #tool_navigate input,
#paginate #tool_navigate a {
border: none;
border-top: 1px solid #3b3b3b;
border-bottom: 1px solid #3b3b3b;
padding: 0;
margin: 0;
border-radius: 0;
height: 50px;
line-height: 50px;
vertical-align: middle;
width: 30px;
background: none;
font-weight: normal;
text-shadow: none;
box-shadow: none;
color: #3b3b3b;
}
#paginate #tool_navigate:first-child {
border-left: 1px solid #3b3b3b;
}
#paginate #tool_navigate:last-child {
border-right: 1px solid #3b3b3b;
}
#paginate #tool_navigate input,
#paginate #tool_navigate a:hover {
color: #fff;
background: #076882;
}