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 #1250 from kwemi/design-update-v1

Browse Source 
Design update v1
This commit is contained in:
Nicolas Le Goff
2015-02-19 10:54:18 +01:00
parent 5a2dfc3380 50352c0e90
commit c6bab1182d
6 changed files with 75 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Prod/Query.php
View File

@@ -152,7 +152,7 @@ class Query implements ControllerProviderInterface
$explain .= '<br><div>' . $result->getDuration() . ' s</div>dans index ' . $result->getIndexes(); $explain .= '<br><div>' . $result->getDuration() . ' s</div>dans index ' . $result->getIndexes();
$explain .= "</div>"; $explain .= "</div>";
$infoResult = '<a href="#" class="infoDialog" infos="' . str_replace('"', '&quot;', $explain) . '">' . $app->trans('reponses:: %total% reponses', ['%total%' => $result->getTotal()]) . '</a> | ' . $app->trans('reponses:: %number% documents selectionnes', ['%number%' => '<span id="nbrecsel"></span>']); $infoResult = '<a href="#" class="infoDialog" infos="' . str_replace('"', '&quot;', $explain) . '">' .$app->trans('%total% reponses', ['%total%' => '<span>'.$result->getTotal().'</span>']) . '</a>' . $app->trans('%number% documents<br/>selectionnes', ['%number%' => '<span id="nbrecsel"></span>']);
$json['infos'] = $infoResult; $json['infos'] = $infoResult;
$json['navigation'] = $string; $json['navigation'] = $string;

2
templates/web/common/index_bootstrap.html.twig
View File

@@ -33,7 +33,7 @@
<body class="PNB"> <body class="PNB">
<div id="mainContainer" class="PNB"> <div id="mainContainer" class="PNB">
{% include 'common/menubar.html.twig' %} {% include 'common/menubar.html.twig' %}
<div class="PNB" id="mainContent" style="top:30px; min-width:900px; overflow-x:auto; overflow-y:auto;"> <div class="PNB" id="mainContent">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
</div> </div>

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

@@ -167,7 +167,7 @@
</li> </li>
{% endif %} {% endif %}
<li style="float:right;"> <li style="float:right;">
<a href="#" class="escamote" style="margin:8px 0;"> <a href="#" class="escamote">
<img src="/skins/icons/workzoneEscamote.png" title="{{ 'Close the WorkZone' | trans }}"/> <img src="/skins/icons/workzoneEscamote.png" title="{{ 'Close the WorkZone' | trans }}"/>
</a> </a>
</li> </li>
@@ -468,6 +468,16 @@
</table> </table>
</div> </div>
</form> </form>
<div id="answers_status">
<div class="infos">
<span id="tool_results">
</span>
</div>
<!--td class="navigation">
<div id="tool_navigate"></div>
</td-->
</div>
</div> </div>
<!-- <!--
@@ -711,22 +721,6 @@
}); });
</script> </script>
</div> </div>
<div id="answers_status" class="PNB">
<table>
<tr>
<td class="infos">
<a href="#" onclick="lookBox(this,event);return false;">{{ 'Preferences' | trans }} </a>
|
<span id="tool_results">
</span>
</td>
<td class="navigation">
<div id="tool_navigate"></div>
</td>
</tr>
</table>
</div>
</div> </div>
</div> </div>
</div> </div>

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@@ -13,6 +13,10 @@ html, body {
z-index: 1; z-index: 1;
} }
#desktop {
min-width: 1100px;
}
*::-moz-selection, *::selection{ *::-moz-selection, *::selection{
background: white; background: white;
color: black; color: black;
@@ -89,6 +93,13 @@ body {
min-height: 500px; min-height: 500px;
} }
#mainContent {
top: 40px;
min-width:900px;
overflow-x:auto;
overflow-y:auto;
}
.PNB { .PNB {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -249,6 +260,11 @@ span.ww_winTitle {
border-radius: 4px; border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
margin:8px 0;
}
#idFrameC .ui-tabs .ui-tabs-nav li a.escamote {
margin:25px 25px 0 0;
} }
#idFrameC .ui-tabs .ui-tabs-nav li:hover a { #idFrameC .ui-tabs .ui-tabs-nav li:hover a {
@@ -607,17 +623,12 @@ div.diapo {
} }
#answers_status{ #answers_status{
top: auto; width: 200px;
left: 10px; float: right;
right: 10px;
height: 30px;
overflow: hidden;
} }
#answers_status table{ #answers_status table{
width: 100%; width: 100%;
height: 20px;
margin: 5px 0;
} }
#answers_status table tr{ #answers_status table tr{
@@ -629,10 +640,35 @@ div.diapo {
text-align: right; text-align: right;
} }
#answers_status table tr td.infos{ #answers_status .infos {
text-align: left; text-align: left;
line-height: 18px;
font-size: 11px;
color: #949494;
} }
#answers_status .infos .infoDialog {
float: left;
color: #949494;
margin-top: 2px;
margin-right: 30px;
}
#answers_status .infos .infoDialog span {
font-size: 20px;
display: block;
}
#answers_status .infos #nbrecsel {
float: left;
font-size: 20px;
margin-right: 10px;
height: 30px;
line-height: 36px;
vertical-align: middle;
}
/******* POPOVERS *************************************************************/ /******* POPOVERS *************************************************************/
#tooltip .popover { #tooltip .popover {
background-color:inherit; background-color:inherit;
@@ -658,7 +694,7 @@ div.diapo {
/******* idFrameT CSS *********************************************************/ /******* idFrameT CSS *********************************************************/
#idFrameT { #idFrameT {
margin-left: -29px; margin-left: -20px;
} }
.submenu .ui-buttonset{ .submenu .ui-buttonset{
@@ -953,6 +989,10 @@ div.diapo {
position: absolute; bottom: 0px; position: absolute; bottom: 0px;
} }
#answers {
padding: 20px;
}
#answers .list { #answers .list {
position: relative; position: relative;
float: left; float: left;
@@ -2714,6 +2754,17 @@ DIV.thesaurus U.w {
/******* MAINMENU ************************************************************/ /******* MAINMENU ************************************************************/
#mainMenu {
height: 40px;
line-height: 40px;
vertical-align: middle;
}
#mainMenu li, #mainMenu li span {
height: 40px;
line-height: 40px;
}
#mainMenu, .publi_group { #mainMenu, .publi_group {
background-color: #333333; background-color: #333333;
} }

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

@@ -517,10 +517,11 @@ function initAnswerForm() {
function answerSizer() { function answerSizer() {
var el = $('#idFrameC').outerWidth(); var el = $('#idFrameC').outerWidth();
if (!$.support.cssFloat) { if (!$.support.cssFloat) {
$('#idFrameC .insidebloc').width(el - 56); // $('#idFrameC .insidebloc').width(el - 56);
} }
var widthA = Math.round(bodySize.x - el - 10); var widthA = Math.round(bodySize.x - el - 10);
$('#rightFrame').width(widthA); $('#rightFrame').width(widthA);
$('#rightFrame').css('left', $('#idFrameC').width());
} }