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

PORT PHRAS-1555/PHRAS-1568 to 4.1

Browse Source
This commit is contained in:
Mike Ng
2017-11-22 15:48:36 +04:00
parent d736e3db36
commit 36b2058add
15 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -5,7 +5,7 @@ install:
make install_assets make install_assets
install_composer: install_composer:
composer install --ignore-platform-reqs composer
install_asset_dependencies: install_asset_dependencies:
npm install npm install

2
package.json
View File

@@ -36,6 +36,6 @@
}, },
"dependencies": { "dependencies": {
"alchemy-embed-medias": "^0.4.4", "alchemy-embed-medias": "^0.4.4",
"phraseanet-production-client": "~0.32.2" "phraseanet-production-client": "../Phraseanet-production-client"
} }
} }

4
resources/www/_shared/styles/_main-menu.scss
View File

@@ -1,9 +1,9 @@
// @import 'variables'; // @import 'variables';
$mainMenuHeight: 40px !default; $mainMenuHeight: 40px !default;
$mainMenuLineHeight: 36px !default; $mainMenuLineHeight: 36px !default;
$mainMenuBackgroundColor: #fceb3f !default; $mainMenuBackgroundColor: #ffe000 !default;
$mainMenuLinkColor: #000000 !default; $mainMenuLinkColor: #000000 !default;
$mainMenuLinkHoverColor: #fffbcd !default; $mainMenuLinkHoverColor: #f2f0e9 !default;
$mainMenuLinkActiveColor: #FFFFFF !default; $mainMenuLinkActiveColor: #FFFFFF !default;
$mainMenuLinkBackgroundHoverColor: transparent !default; $mainMenuLinkBackgroundHoverColor: transparent !default;
$mainMenuLinkHoverColor: #000000 !default; $mainMenuLinkHoverColor: #000000 !default;

4
resources/www/admin/styles/_databases.scss
View File

@@ -5,7 +5,7 @@
} }
.db_exception { .db_exception {
margin-top: 10px; margin-top: 10px;
background-color: #fceb3f; background-color: #ffe000;
} }
.db_infos { .db_infos {
width: 100%; width: 100%;
@@ -38,7 +38,7 @@ div[id$="_indexed_bar"] {
height: 15px; height: 15px;
position: absolute; position: absolute;
z-index: 6; z-index: 6;
background: #e5d4a0; background: #dbd8cc;
} }
div[id$="_indexed_percent"] { div[id$="_indexed_percent"] {
width: 198px; width: 198px;

1
resources/www/admin/styles/_fields.scss
View File

@@ -233,6 +233,7 @@
#admin-field-app .save-all{ #admin-field-app .save-all{
padding: 15px; padding: 15px;
margin-bottom: 8px;
} }
#admin-field-app .overlay { #admin-field-app .overlay {

20
resources/www/admin/styles/_tables.scss
View File

@@ -19,7 +19,7 @@ table.whoisTable tr {
border: #cccccc 1px solid; border: #cccccc 1px solid;
} }
table.whoisTable tr:hover { table.whoisTable tr:hover {
background-color: #fffbcd; background-color: #f2f0e9;
} }
table.whoisTable td { table.whoisTable td {
padding: 3px; padding: 3px;
@@ -47,10 +47,10 @@ table.admintable tr {
vertical-align: middle; vertical-align: middle;
} }
table.admintable tr.selected:hover { table.admintable tr.selected:hover {
background-color: #faa732; background-color: #aaa8a5;
} }
table.admintable thead { table.admintable thead {
background-color: #e5d4a0; background-color: #dbd8cc;
} }
table.admintable thead th { table.admintable thead th {
padding: 3px; padding: 3px;
@@ -58,13 +58,13 @@ table.admintable thead th {
font-weight: bold; font-weight: bold;
} }
table.admintable tbody tr.even { table.admintable tbody tr.even {
background-color: #fffbcd; background-color: #f2f0e9;
} }
table.admintable tbody tr.selected { table.admintable tbody tr.selected {
background-color: #faa732; background-color: #aaa8a5;
} }
table.admintable tbody tr:hover { table.admintable tbody tr:hover {
background-color: #faa732; background-color: #aaa8a5;
cursor: pointer; cursor: pointer;
} }
table.admintable tbody td { table.admintable tbody td {
@@ -87,10 +87,10 @@ table.admintable .centered {
display: none; display: none;
} }
#users th.sortable.hover { #users th.sortable.hover {
background-color: #faa732; background-color: #aaa8a5;
} }
#users th.sortable.sorted { #users th.sortable.sorted {
background-color: #faa732; background-color: #aaa8a5;
} }
#users th.sortable.sorted span.ord_notifier { #users th.sortable.sorted span.ord_notifier {
display: inline; display: inline;
@@ -125,8 +125,8 @@ td.users_col.options {
font-weight: bold; font-weight: bold;
} }
#tooltip-usr #tabledescexp td.tooltip-title { #tooltip-usr #tabledescexp td.tooltip-title {
background-color: #faa732; background-color: #aaa8a5;
border: 1px solid #f39106; border: 1px solid #aaa8a5;
margin: 10px auto; margin: 10px auto;
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;

12
resources/www/admin/styles/main.scss
View File

@@ -87,12 +87,12 @@ select {
} }
li.selected, li.selected,
div.selected { div.selected {
background-color: #faa732; background-color: #aaa8a5;
color: #ffffff; color: #ffffff;
} }
li.selected a, li.selected a,
div.selected a { div.selected a {
background-color: #faa732; background-color: #aaa8a5;
color: #ffffff; color: #ffffff;
} }
.treeview ul { .treeview ul {
@@ -114,7 +114,7 @@ div.finder div.content div.title {
/******* MAIN MENU ************************************************************/ /******* MAIN MENU ************************************************************/
$mainMenuBackgroundColor: #fceb3f; $mainMenuBackgroundColor: #ffe000;
$mainMenuLinkColor: #333333; $mainMenuLinkColor: #333333;
$mainMenuLinkHoverColor: #000000; $mainMenuLinkHoverColor: #000000;
$mainMenuLinkActiveColor: #000000; $mainMenuLinkActiveColor: #000000;
@@ -128,14 +128,14 @@ $mainMenuLinkBackgroundHoverColor: transparent;
/******* LEFT SIDE ************************************************************/ /******* LEFT SIDE ************************************************************/
#left { #left {
background-color: #fffbcd; background-color: #f2f0e9;
overflow: auto; overflow: auto;
} }
#FNDR { #FNDR {
overflow: auto; overflow: auto;
} }
#FNDR li.selected { #FNDR li.selected {
background-color: #faa732; background-color: #aaa8a5;
color: #ffffff; color: #ffffff;
} }
#FNDR a { #FNDR a {
@@ -256,7 +256,7 @@ div.switch_right.unchecked {
background-size: 16px; background-size: 16px;
} }
.board_section div[class="section"] ul.setup li:hover { .board_section div[class="section"] ul.setup li:hover {
background-color: #fffbcd; background-color: #f2f0e9;
} }
/******* PUBLICATIONS *********************************************************/ /******* PUBLICATIONS *********************************************************/
#pub_icon { #pub_icon {

2
templates/web/admin/collection/collection.html.twig
View File

@@ -55,7 +55,7 @@
<div class="input-append"> <div class="input-append">
<input class="admin_adder" placeholder="{{ 'setup:: ajouter un administrateur des commandes' | trans }}"/> <input class="admin_adder" placeholder="{{ 'setup:: ajouter un administrateur des commandes' | trans }}"/>
<input type="hidden" name="admins[]"/> <input type="hidden" name="admins[]"/>
<input type="submit" class="btn btn-warning" value="{{ 'boutton::valider' | trans }}" /> <input type="submit" class="btn btn-primary" value="{{ 'boutton::valider' | trans }}" />
</div> </div>
</form> </form>
</div> </div>

8
templates/web/admin/dashboard.html.twig
View File

@@ -108,14 +108,14 @@
{% endfor %} {% endfor %}
<input class="admin_adder input-large" placeholder="{{ 'Add an admin' | trans }}"/> <input class="admin_adder input-large" placeholder="{{ 'Add an admin' | trans }}"/>
</ul> </ul>
<input type="submit" class="btn btn-warning" value="{{ 'boutton::valider' | trans }}" /> <input type="submit" class="btn btn-primary" value="{{ 'boutton::valider' | trans }}" />
<input type="hidden" class="new" name="admins[]" /> <input type="hidden" class="new" name="admins[]" />
</fieldset> </fieldset>
</form> </form>
<form id="admin_reset" action="{{ path('admin_dashboard_reset_admin_rights') }}" method="post" class="form-inline" style="display:inline"> <form id="admin_reset" action="{{ path('admin_dashboard_reset_admin_rights') }}" method="post" class="form-inline" style="display:inline">
<fieldset> <fieldset>
<legend>{{ 'setup:: Reinitialisation des droits admins' | trans }}</legend> <legend>{{ 'setup:: Reinitialisation des droits admins' | trans }}</legend>
<input type="submit" class="btn btn-warning" value="{{ 'boutton::reinitialiser' | trans }}" /> <input type="submit" class="btn btn-primary" value="{{ 'boutton::reinitialiser' | trans }}" />
</fieldset> </fieldset>
</form> </form>
</div> </div>
@@ -127,7 +127,7 @@
<legend>{{ 'setup::Tests d\'envois d\'emails' | trans }}</legend> <legend>{{ 'setup::Tests d\'envois d\'emails' | trans }}</legend>
<div class="input-append"> <div class="input-append">
<input class="span3" id="appendedInputButton" name="email" value="" type="text" placeholder="{% trans %}Email{% endtrans %}" required> <input class="span3" id="appendedInputButton" name="email" value="" type="text" placeholder="{% trans %}Email{% endtrans %}" required>
<input type="submit" class="btn btn-warning" value="{{ 'Send' | trans }}"/> <input type="submit" class="btn btn-primary" value="{{ 'Send' | trans }}"/>
</div> </div>
</fieldset> </fieldset>
</form> </form>
@@ -143,7 +143,7 @@
<form id="cache_flusher" method="post" action="{{ path('admin_dashboard_flush_cache') }}" class="form-inline"> <form id="cache_flusher" method="post" action="{{ path('admin_dashboard_flush_cache') }}" class="form-inline">
<fieldset> <fieldset>
<legend>{% trans %}Reset cache{% endtrans %}</legend> <legend>{% trans %}Reset cache{% endtrans %}</legend>
<input type="submit" id="flush_button" class="btn btn-warning span4" value="Flush All Caches" /> <input type="submit" id="flush_button" class="btn btn-primary span4" value="Flush All Caches" />
</fieldset> </fieldset>
</form> </form>
</div> </div>

2
templates/web/admin/databox/cgus.html.twig
View File

@@ -8,7 +8,7 @@
<input type="checkbox" value="1" id="valid" name="valid"/> <input type="checkbox" value="1" id="valid" name="valid"/>
{{ 'admin::CGU Les utilisateurs doivent imperativement revalider ces conditions' | trans }} {{ 'admin::CGU Les utilisateurs doivent imperativement revalider ces conditions' | trans }}
</label> </label>
<input class='btn btn-warning' type="submit" value="{{ 'Mettre a jour' | trans }}"/> <input class='btn btn-primary' type="submit" value="{{ 'Mettre a jour' | trans }}"/>
</div> </div>
<div id="tabs"> <div id="tabs">
<ul> <ul>

2
templates/web/admin/fields/templates.html.twig
View File

@@ -4,7 +4,7 @@
</script> </script>
<script type="text/template" id="save_template"> <script type="text/template" id="save_template">
<button type="button" class="btn btn-success save-all"> <button type="button" class="btn btn-primary save-all">
<i class="icon-hdd icon-white"></i> {% trans %}Save all changes{% endtrans %} <i class="icon-hdd icon-white"></i> {% trans %}Save all changes{% endtrans %}
</button> </button>
</script> </script>

2
templates/web/admin/publications/fiche.html.twig
View File

@@ -125,7 +125,7 @@
</div> </div>
</div> </div>
<div> <div>
<button class="btn btn-warning" type="submit">{{ 'boutton::valider' | trans }}</button> <button class="btn btn-primary" type="submit">{{ 'boutton::valider' | trans }}</button>
<a href="{{ path('admin_feeds_list') }}" class="btn" style="text-decoration:none;">{{ 'boutton::annuler' | trans }}</a> <a href="{{ path('admin_feeds_list') }}" class="btn" style="text-decoration:none;">{{ 'boutton::annuler' | trans }}</a>
</div> </div>
</form> </form>

2
templates/web/admin/publications/list.html.twig
View File

@@ -42,7 +42,7 @@
</div> </div>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<button type="submit" class="btn btn-warning">{{ 'boutton::valider' | trans }}</button> <button type="submit" class="btn btn-primary">{{ 'boutton::valider' | trans }}</button>
</div> </div>
</fieldset> </fieldset>
</form> </form>

2
templates/web/admin/setup.html.twig
View File

@@ -53,7 +53,7 @@
{% endfor %} {% endfor %}
<div class="well well-large"> <div class="well well-large">
<div style="max-width: 400px;margin: 0 auto 10px;"> <div style="max-width: 400px;margin: 0 auto 10px;">
<input type="submit" class="btn btn-warning btn-block btn-large" value="{{ 'boutton::valider' | trans }}"/> <input type="submit" class="btn btn-primary btn-block btn-large" value="{{ 'boutton::valider' | trans }}"/>
</div> </div>
</div> </div>
{{ form_end(form) }} {{ form_end(form) }}

4
templates/web/admin/users.html.twig
View File

@@ -73,7 +73,7 @@
<form id="users_reset_rights" method="post" action="{{ path('admin_users_rights_reset') }}" target="_self" class="form-inline pull-right" style="margin:0"> <form id="users_reset_rights" method="post" action="{{ path('admin_users_rights_reset') }}" target="_self" class="form-inline pull-right" style="margin:0">
<fieldset class="admin_head_opts"> <fieldset class="admin_head_opts">
<input type="hidden" value="" name="users"> <input type="hidden" value="" name="users">
<button type='button' class="btn btn-warning">{{ 'Delete all users rights' | trans }}</button> <button type='button' class="btn btn-primary">{{ 'Delete all users rights' | trans }}</button>
</fieldset> </fieldset>
</form> </form>
@@ -248,7 +248,7 @@
{% endif %} {% endif %}
<input name="like_value" value="{{parm.like_value}}" type="hidden" /> <input name="like_value" value="{{parm.like_value}}" type="hidden" />
<input name="like_field" value="{{parm.like_field}}" type="hidden" /> <input name="like_field" value="{{parm.like_field}}" type="hidden" />
<button class="btn btn-warning">{{ 'boutton::exporter' | trans }}</button> <button class="btn btn-primary">{{ 'boutton::exporter' | trans }}</button>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">