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

Merge pull request #3090 from HRavalomanana/PHRAS-2544_Prod-grey_and_white_skins_colors

Browse Source 
PHRAS-2544 #comment merge  update fix on grey and white theme
This commit is contained in:
Nicolas Maillat
2019-07-05 15:41:54 +02:00
committed by GitHub
parent 4a55ad2dd4 6147cd62f8
commit 8949f53254
5 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script> <script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script>
{% endblock %} {% endblock %}
</head> </head>
<body class="PNB"> <body class="PNB {{ cssfile }}">
<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="overflow: auto"> <div class="PNB" id="mainContent" style="overflow: auto">

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

@@ -1,5 +1,5 @@
<div> <div>
<button class="tools-accordion"><span>Actions<i class="fa fa-chevron-right rotate"></i></span></button> <button class="tools-accordion">Actions</button>
<div class="tools-panel"> <div class="tools-panel">
<button class="ui-corner-all TOOL_disktt_btn basket_window" data-selection-source="basket"> <button class="ui-corner-all TOOL_disktt_btn basket_window" data-selection-source="basket">
<img src="/assets/common/images/icons/disktt_history.png"/> <img src="/assets/common/images/icons/disktt_history.png"/>

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

@@ -33,7 +33,7 @@
/> />
</td> </td>
<td> <td>
<a class="contextMenuTrigger"></a> <a class="contextMenuTrigger icon-display-grid" href="#"></a>
</td> </td>
</tr> </tr>
</table> </table>
@@ -127,7 +127,7 @@
{% endif %} {% endif %}
--> -->
<td> <td>
<a class="contextMenuTrigger"></a> <a class="contextMenuTrigger icon-display-grid" href="#"></a>
</td> </td>
</tr> </tr>
</table> </table>
@@ -230,7 +230,7 @@
<table> <table>
<tr> <tr>
<td> <td>
<a class="contextMenuTrigger"></a> <a class="contextMenuTrigger icon-display-grid" href="#"></a>
</td> </td>
</tr> </tr>
</table> </table>

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

@@ -277,6 +277,9 @@
{% endif %} {% endif %}
<div id="FIRST_QUERY_CONTAINER" class="last-query" style="display: none" data-format="json">{{ startq | raw }}</div> <div id="FIRST_QUERY_CONTAINER" class="last-query" style="display: none" data-format="json">{{ startq | raw }}</div>
{% endif %} {% endif %}
{#container fetched by js #}
<input type="hidden" name="advanced-search-title" id="advanced-search-title" value="{{ 'Advanced Search' | trans }}">
<form id="searchForm" method="POST" action="{{ path('prod_query') }}" name="phrasea_query" class="phrasea_query"> <form id="searchForm" method="POST" action="{{ path('prod_query') }}" name="phrasea_query" class="phrasea_query">
<input id="SENT_query" name="qry" type="hidden" value="{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page_query')}}"> <input id="SENT_query" name="qry" type="hidden" value="{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page_query')}}">
<input type="hidden" name="pag" id="formAnswerPage" value=""> <input type="hidden" name="pag" id="formAnswerPage" value="">
@@ -454,7 +457,7 @@
<hr /> <hr />
<label class="status-section-title"> <label class="status-section-title">
<span class="danger_indicator">{{ 'Date(s) from field(s)' | trans }}</span> <span class="danger_indicator">{{ 'Date(s) from field(s)' | trans }}</span>
<img id="info-box-trigger" src="/assets/common/images/icons/info-white.png" width="18" height="18"> <img id="info-box-trigger" src="/assets/common/images/icons/Info-white.png" width="18" height="18">
<div id="info-box"> <div id="info-box">
<p> <p>
{{ 'prod::advancesearch:tooltips:datefield_restriction_explanation' | trans }} {{ 'prod::advancesearch:tooltips:datefield_restriction_explanation' | trans }}

48
templates/web/prod/preview/popularity.html.twig
View File

@@ -67,7 +67,16 @@
} }
} }
var $color = "#FFFFFF";
if ($('body').hasClass('000000')) {
$color = "#FFFFFF";
}
if ($('body').hasClass('FFFFFF')) {
$color = "#000000";
}
/*if ($('body').hasClass('959595')) {
$color = "#000000";
}*/
function drawChartVisualisation() { function drawChartVisualisation() {
var maxValue = statistics.max_views < 4 ? 4 : statistics.max_views; var maxValue = statistics.max_views < 4 ? 4 : statistics.max_views;
var data = new google.visualization.DataTable(); var data = new google.visualization.DataTable();
@@ -76,9 +85,10 @@
data.addRows(arrayViews); data.addRows(arrayViews);
var options = { var options = {
titleTextStyle: { titleTextStyle: {
color: 'white', color: $color,
fontSize: 13 fontSize: 13
}, },
colors: ['#FF9900'], colors: ['#FF9900'],
@@ -87,28 +97,28 @@
hAxis: { hAxis: {
title: '{{ 'preview::date' | trans }}', title: '{{ 'preview::date' | trans }}',
titleTextStyle: { titleTextStyle: {
color: 'white', color: $color,
fontSize: 11 fontSize: 11
}, },
textStyle:{color: '#FFF'}, textStyle:{color: $color},
format: 'd/M/yy', format: 'd/M/yy',
gridlines: {color: 'none'}, gridlines: {color: 'none'},
min: new Date(statistics.from), min: new Date(statistics.from),
max: new Date(statistics.to), max: new Date(statistics.to),
baselineColor: '#FFF' baselineColor: $color
}, },
vAxis: { vAxis: {
title: '{{ 'preview::visualisation' | trans }}', title: '{{ 'preview::visualisation' | trans }}',
titleTextStyle: { titleTextStyle: {
color: 'white', color: $color,
fontSize: 11 fontSize: 11
}, },
textStyle:{color: '#FFF'}, textStyle:{color: $color},
minValue: 0, minValue: 0,
maxValue: maxValue, maxValue: maxValue,
baselineColor: '#FFF' baselineColor: $color
}, },
legend: {position: 'top', textStyle: {color: 'white'}}, legend: {position: 'top', textStyle: {color: $color}},
}; };
var chart = new google.visualization.ColumnChart( var chart = new google.visualization.ColumnChart(
@@ -128,7 +138,7 @@
var options = { var options = {
titleTextStyle: { titleTextStyle: {
color: 'white', color: $color,
fontSize: 13 fontSize: 13
}, },
colors: ['#FF9900'], colors: ['#FF9900'],
@@ -137,29 +147,29 @@
hAxis: { hAxis: {
title: '{{ 'preview::date' | trans }}', title: '{{ 'preview::date' | trans }}',
titleTextStyle: { titleTextStyle: {
color: 'white', color: $color,
fontSize: 11 fontSize: 11
}, },
textStyle:{color: '#FFF'}, textStyle:{color: $color},
format: 'd/M/yy', format: 'd/M/yy',
gridlines: {color: 'none'}, gridlines: {color: 'none'},
min: new Date(statistics.from), min: new Date(statistics.from),
max: new Date(statistics.to), max: new Date(statistics.to),
baselineColor: '#FFF' baselineColor: $color
}, },
vAxis: { vAxis: {
title: '{{ 'preview::downloads' | trans }}', title: '{{ 'preview::downloads' | trans }}',
titleTextStyle: { titleTextStyle: {
color: 'white', color: $color,
fontSize: 11 fontSize: 11
}, },
textStyle:{color: '#FFF'}, textStyle:{color: $color},
minValue: 0, minValue: 0,
maxValue: maxValue, maxValue: maxValue,
baselineColor: '#FFF', baselineColor: $color,
format: '0' format: '0'
}, },
legend: {position: 'top', textStyle: {color: 'white'}}, legend: {position: 'top', textStyle: {color: $color}},
}; };
var chart = new google.visualization.ColumnChart( var chart = new google.visualization.ColumnChart(
@@ -175,7 +185,7 @@
'backgroundColor': 'transparent', 'backgroundColor': 'transparent',
is3D: true, is3D: true,
colors:['#FF9900','#3FDFFD', '#14CAB5', '#CAA514', '#97853C'], colors:['#FF9900','#3FDFFD', '#14CAB5', '#CAA514', '#97853C'],
legend: {position: 'right', textStyle: {color: 'white'}}, legend: {position: 'right', textStyle: {color: $color}},
chartArea: {width:'90%',height:'70%'} chartArea: {width:'90%',height:'70%'}
}; };
@@ -199,4 +209,4 @@
}); });
</script> </script>