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 #1356 from kwemi/issue-tuesday

Browse Source 
Issue tuesday
This commit is contained in:
Benoît Burnichon
2015-04-21 18:06:19 +02:00
parent a5c2ed4a47 bd35165960
commit 316868b3d2
6 changed files with 104 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/record/preview.php
View File

@@ -279,7 +279,7 @@ class record_preview extends record_adapter
switch ($this->env) {
case "RESULT":
$this->title .= $this->app->trans('preview:: resultat numero %number%', ['%number%' => '<span id="current_result_n">' . ($this->number + 1) . '</span> : ']);
$this->title .= $this->app->trans('resultat numero %number%', ['%number%' => '<span id="current_result_n">' . ($this->number + 1) . '</span> : ']);
$this->title .= parent::get_title($highlight, $searchEngine);
break;
case "BASK":

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

@@ -211,7 +211,7 @@
{{WorkZoneMacros.make_bloc(app, WorkZone)}}
</div>
{% if GV_thesaurus %}
<div id="proposals" class="PNB" style="top:85px;"
<div id="proposals" class="PNB"
ondblclick="return(thesau_dblclickThesaurus(event));" onclick="return(thesau_clickThesaurus(event));">
<button id="facets-back-btn" style="display:none;">back</button>
</div>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@@ -1196,7 +1196,7 @@ div.diapo {
left: 0pt;
right: 1px;
bottom: 0px;
overflow-y: hidden;
overflow-y: auto;
overflow-x: hidden;
}
@@ -2149,6 +2149,20 @@ H4 {
/******* PROPOSALS ************************************************************/
#proposals {
border-top: 1px solid #303030;
top: 87px !important;
}
#proposals ul li {
line-height: 17px;
font-size: 13px;
}
#proposals ul ul {
background-color: #292929;
}
#proposals *:focus{
outline: none;
}
@@ -2157,21 +2171,47 @@ H4 {
background-color: #3b3b3b;
border: 0px none transparent;
overflow-x: hidden;
padding-left: 0;
padding-top: 0;
}
#proposals UL.fancytree-container UL {
padding: 0;
padding-left: 6px;
margin-right: 30px;
overflow: hidden;
padding: 17px 0;
overflow: auto;
width: 101%;
max-height: 400px;
overflow-x: hidden;
}
#proposals UL.fancytree-container UL li {
padding-left: 30px;
line-height: 25px;
}
#proposals UL.fancytree-container UL li:hover {
background-color: #4c5d84;
}
#proposals .fancytree-folder {
font-weight: bold;
height: 30px;
padding-top: 7px;
border-left: 4px solid #4c5d84;
height: 49px;
line-height: 49px;
margin-left: 0;
border-left: 4px solid #3b3b3b;
border-bottom: 1px solid #303030;
}
#proposals .fancytree-folder:hover {
border-left: 4px solid #4c5d84;
color: #fff;
}
#proposals .fancytree-folder:hover .fancytree-title {
color: #fff;
}
#proposals .fancytree-folder .fancytree-title {
font-size: 13px;
}
#proposals .fancytree-expander {
@@ -2186,6 +2226,10 @@ H4 {
font-size: 65%;
}
#proposals UL.fancytree-container UL li{
white-space: pre-line !important;
}
#proposals .fancytree-folder .fancytree-expander:before {
content: '\25C0'; /* U+25C0 BLACK LEFT-POINTING TRIANGLE */
color: #a0a0a0;
@@ -2202,27 +2246,34 @@ H4 {
}
#proposals .fancytree-title {
color: #FFFFFF;
font-size: 12px;
color: #A6A6A6;
background-color: transparent;
border: 0px none transparent;
}
#proposals UL.fancytree-container UL li:hover .fancytree-title {
color: #fff;
}
#proposals .facetFilter {
font-weight: normal;
position:absolute;
width:100px;
height:22px;
width:122px;
height:25px;
line-height: 25px;
vertical-align: middle;
border-radius: 4px;
right:30px;
background-color: #606060;
padding-top: 3px;
padding-left: 4px;
padding-right: 4px;
right:28px;
background-color: #4c5d84;
padding-left: 13px;
padding-right: 13px;
margin-top: 11px;
}
#proposals .facetFilter-label {
position:absolute;
left:4px;
left:13px;
right: 14px;
overflow:hidden;
cursor: default;
@@ -2232,17 +2283,18 @@ H4 {
position:absolute;
width:20px;
right: 0px;
background-image: linear-gradient(to right, transparent, #606060);
}
#proposals .facetFilter-closer {
position:absolute;
right:5px;
right:13px;
cursor: pointer;
}
#proposals .facetFilter-closer:before {
content: 'x';
#proposals .facetFilter-closer {
background: url('../../icons/bgd_facetFilter.png') 0 5px no-repeat;
height: 25px;
width: 14px;
}
/******* /PROPOSALS ************************************************************/
@@ -3275,6 +3327,10 @@ DIV.thesaurus U.w {
cursor: pointer;
}
#PREVIEWBOX #PREVIEWTITLE_COLLNAME {
display:none;
}
.PREVIEW_PIC,.PREVIEW_HD {
position: absolute;
}
@@ -3386,6 +3442,24 @@ DIV.thesaurus U.w {
overflow-y: hidden;
}
#PREVIEWCURRENTCONT::-webkit-scrollbar-track
{
border-radius: 0;
background-color: #262626;
}
#PREVIEWCURRENTCONT::-webkit-scrollbar {
height: 5px;
border-radius: 0;
}
#PREVIEWCURRENTCONT::-webkit-scrollbar-thumb {
border-radius: 0;
width: 3px;
background-color: #595959;
}
#PREVIEWCURRENTCONT ul {
position: relative;
height: 80px;
@@ -4838,6 +4912,7 @@ ui-dialog-titlebar {
#paginate {
float: right;
margin: 0 65px 15px 0;
min-height: 52px;
}
#paginate #tool_navigate {

BIN
www/skins/prod/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

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

@@ -569,7 +569,12 @@ function getFacetsTree() {
var s_label = document.createElement("SPAN");
s_label.setAttribute("class", "facetFilter-label");
s_label.setAttribute("title", facetFilter);
s_label.appendChild(document.createTextNode(facetFilter));
var length = 15;
var facetFilterString = facetFilter;
var facetFilterTruncatedString = facetFilterString.substring(0,length);
s_label.appendChild(document.createTextNode(facetFilterTruncatedString));
var s_closer = document.createElement("A");
s_closer.setAttribute("class", "facetFilter-closer");