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

Merge branch 'master' into PHRAS-2686_paging_new_design

Browse Source
This commit is contained in:
Harrys Ravalomanana
2019-09-20 14:35:36 +04:00
committed by GitHub
parent c16dc45208 861785e7ab
commit e052d2ad06
5 changed files with 115 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/www/common/js/components/common.js
View File

@@ -31,17 +31,13 @@ var commonModule = (function ($, p4) {
$(this).removeClass('context-menu-item-hover'); $(this).removeClass('context-menu-item-hover');
}); });
// $('#help-trigger').contextMenu('#mainMenu .helpcontextmenu', {openEvt: 'click', dropDown: true, theme: 'vista', dropDown: true,
// showTransition: 'slideDown',
// hideTransition: 'hide',
// shadow: false
// });
$('body').on('click', '.infoDialog', function (event) { $('body').on('click', '.infoDialog', function (event) {
infoDialog($(this)); infoDialog($(this));
}); });
}); });
function showOverlay(n, appendto, callback, zIndex) { function showOverlay(n, appendto, callback, zIndex) {
var div = "OVERLAY"; var div = "OVERLAY";

16
resources/www/common/styles/main.scss
View File

@@ -88,4 +88,20 @@ $mainMenuLinkBackgroundHoverColor: transparent;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.39); box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.39);
} }
} }
/*Help menu*/
.contextMenu.helpcontextmenu {
display: none;
&.shown {
display: block;
position: absolute;
z-index: 101;
}
}
.help-trigger {
display:inline-block;
cursor:pointer;
padding: 0 4px;
border:none;
margin-left: -12px;
}

16
resources/www/report/styles/main.scss
View File

@@ -110,7 +110,7 @@ $select-height: 26px;
} }
.input-prepend { .input-prepend {
margin: 0; margin: 0;
.dmin, .dmax { .dmin, .dmax {
border: 0 none; border: 0 none;
height: 16px; height: 16px;
@@ -203,7 +203,7 @@ $select-height: 26px;
height: $select-height; height: $select-height;
} }
.select-styled { .select-styled {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
@@ -232,9 +232,9 @@ $select-height: 26px;
background-color: darken($select-background, 5); background-color: darken($select-background, 5);
} }
} }
.select-options { .select-options {
display: none; display: none;
position: absolute; position: absolute;
top: 12px; top: 12px;
right: -12px; right: -12px;
@@ -292,7 +292,7 @@ $select-height: 26px;
-webkit-transform: translate(-50%, -50%); -webkit-transform: translate(-50%, -50%);
-ms-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
&:hover { &:hover {
background-color: #2c2c2c; background-color: #2c2c2c;
} }
@@ -355,4 +355,8 @@ $select-height: 26px;
&.ui-widget-content{ &.ui-widget-content{
background-color: #212121; background-color: #212121;
} }
} }
#mainMenu li .context-menu-item-inner a:hover {
color: #000;
}

165
templates/web/common/menubar.html.twig
View File

@@ -25,103 +25,103 @@
<div id="nav_menu_container" class="desktopmenu"> <div id="nav_menu_container" class="desktopmenu">
<div class="arrow-up"></div> <div class="arrow-up"></div>
<ol class="nav_menu"> <ol class="nav_menu">
<li class="menu-bar-item"> <li class="menu-bar-item">
<a target="_blank" href="{{ path('prod') }}"> <a target="_blank" href="{{ path('prod') }}">
<img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "prod" %}selected{% endif %}"> <span class="{% if module is defined and module == "prod" %}selected{% endif %}">
{{ 'admin::monitor: production' | trans }} {{ 'admin::monitor: production' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus') %} {% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus') %}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a target="_blank" href="{{ path('thesaurus') }}"> <a target="_blank" href="{{ path('thesaurus') }}">
<img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}"> <span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}">
{{ 'admin::monitor: module thesaurus' | trans }} {{ 'admin::monitor: module thesaurus' | trans }}
</span> </span>
</a>
</li>
{% endif %}
{# MODULE #}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %}
<li class="menu-bar-item">
<a target="_blank" href="{{ path('admin') }}">
<img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "admin" %}selected{% endif %}">
{{ 'admin::monitor: module admin' | trans }}
</span>
</a>
</li>
{% endif %}
{# MODULE #}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %}
<li class="menu-bar-item">
<a target="_blank" href="{{ path('report_dashboard') }}">
<img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "report" %}selected{% endif %}">
{{ 'admin::monitor: module report' | trans }}
</span>
</a>
</li>
{% endif %}
{# MODULE #}
<li class="menu-bar-item">
<a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
<img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/>
<span>
{{ 'admin::monitor: module validation' | trans }}
</span>
</a> </a>
</li> </li>
{% endif %}
{# MODULE #}
{% if module is defined and module == "prod" %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('upload') %}
<li class="menu-bar-item">
{% set link = path('upload_html5_form') %}
{% if not app['browser'].supportFileAPI() %} {# MODULE #}
{% set link = path('upload_flash_form') %} {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %}
{% endif %} <li class="menu-bar-item">
<a target="_blank" href="{{ path('admin') }}">
<img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "admin" %}selected{% endif %}">
{{ 'admin::monitor: module admin' | trans }}
</span>
</a>
</li>
{% endif %}
<a href="{{ link }}" class="uploader-open-action" {# MODULE #}
title="{{ 'Upload' | trans }}"> {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %}
<img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/> <li class="menu-bar-item">
<span> <a target="_blank" href="{{ path('report_dashboard') }}">
<img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "report" %}selected{% endif %}">
{{ 'admin::monitor: module report' | trans }}
</span>
</a>
</li>
{% endif %}
{# MODULE #}
<li class="menu-bar-item">
<a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
<img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/>
<span>
{{ 'admin::monitor: module validation' | trans }}
</span>
</a>
</li>
{# MODULE #}
{% if module is defined and module == "prod" %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('upload') %}
<li class="menu-bar-item">
{% set link = path('upload_html5_form') %}
{% if not app['browser'].supportFileAPI() %}
{% set link = path('upload_flash_form') %}
{% endif %}
<a href="{{ link }}" class="uploader-open-action"
title="{{ 'Upload' | trans }}">
<img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
<span>
{{ 'admin::monitor: module upload' | trans }} {{ 'admin::monitor: module upload' | trans }}
</span> </span>
</a>
</li>
{% endif %}
{% endif %}
{# MODULE #}
{% if module == "prod" %}
<li class="menu-bar-item">
<a href="#" class="state-navigation" data-state="publication">
<img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/>
<span>
{{ 'Publications' | trans }}
</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endif %}
{% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %} {# MODULE #}
<li class="menu-bar-item"> {% if module == "prod" %}
<a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}"> <li class="menu-bar-item">
<a href="#" class="state-navigation" data-state="publication">
<img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/>
<span>
{{ 'Publications' | trans }}
</span>
</a>
</li>
{% endif %}
{% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %}
<li class="menu-bar-item">
<a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}">
<span> <span>
{{ 'Commandes' | trans }} {{ 'Commandes' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
</ol> </ol>
</div> </div>
@@ -235,11 +235,10 @@
<a target="_blank" href="https://docs.phraseanet.com/4.0/"> <a target="_blank" href="https://docs.phraseanet.com/4.0/">
<span> <span>
{{ 'phraseanet:: aide' | trans }} {{ 'phraseanet:: aide' | trans }}
<span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
id="help-trigger"> <i class="fa fa-caret-down" aria-hidden="true"></i></span>
</span> </span>
</a> </a>
<table cellspacing="0" cellpadding="0" style="display:none;" class="contextMenu helpcontextmenu"> <span id="help-trigger" class="help-trigger"> <i class="fa fa-caret-down" aria-hidden="true"></i></span>
<table cellspacing="0" cellpadding="0" class="contextMenu helpcontextmenu context-menu-theme-vistamenu-bar">
<tbody> <tbody>
<tr> <tr>
<td> <td>
@@ -301,6 +300,10 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$('body').on('click', '#help-trigger', function (event) {
$('#mainMenu .helpcontextmenu').toggleClass('shown');
console.log('mety');
});
// var key = 'help'; // var key = 'help';
var configurationSettingLinks = {{ configuration|json_encode|raw }}; var configurationSettingLinks = {{ configuration|json_encode|raw }};
//seperate array based on location of link //seperate array based on location of link

6
templates/web/prod/actions/edit_default.html.twig
View File

@@ -196,8 +196,10 @@
<div style="position:absolute; top:0px; left:0px; right:70px; height:17px;"> <div style="position:absolute; top:0px; left:0px; right:70px; height:17px;">
<input type='text' style="font-size:15px; position:absolute; top:0px; left:0px; width:100%; height:100%;" id="EditTextMultiValued" value="" /> <input type='text' style="font-size:15px; position:absolute; top:0px; left:0px; width:100%; height:100%;" id="EditTextMultiValued" value="" />
</div> </div>
<div style="position:absolute; top:6px; width:60px; right:0px; height:11px;"> <div style="position:absolute; top:4px; width:60px; right:6px; height:24px;">
<img id="EditButAddMultiValued add-multivalued-field-action" style="cursor:pointer" src="/assets/common/images/icons/plus16.png" /> <button type="submit" class="submit-multivalued">
<img id="EditButAddMultiValued" style="cursor:pointer" src="/assets/common/images/icons/plus16.png" />
</button>
</div> </div>
</form> </form>
<div id="ZTextMultiValued_values"></div> <div id="ZTextMultiValued_values"></div>