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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig
This commit is contained in:
Nicolas Le Goff
2014-01-24 18:52:14 +01:00
parent c0919fbdc9 d61917707a
commit 6ba5ce6669
9 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php
View File

@@ -84,6 +84,8 @@ class XSendFileMappingGenerator extends Command
private function extractPath(\appbox $appbox)
{
$paths = array();
foreach ($appbox->get_databoxes() as $databox) {
$paths[] = (string) $databox->get_sxml_structure()->path;
foreach ($databox->get_subdef_structure() as $group => $subdefs) {

2
lib/Alchemy/Phrasea/Controller/Admin/Root.php
View File

@@ -104,8 +104,6 @@ class Root implements ControllerProviderInterface
return $app->redirectPath('logout');
}
$section = $request->query->get('section', false);
$available = [
'connected',
'registrations',

2
lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
View File

@@ -134,7 +134,7 @@ class Migration38 implements MigrationInterface
private function fetchInstanceKey()
{
$stmt = $this->app['phraseanet.appbox']->get_connection()->prepare('SELECT `value` FROM registry WHERE `key` = "GV_SIT"');
$stmt = $this->app['phraseanet.appbox']->get_connection()->prepare('SELECT `value` FROM registry WHERE `key` = "GV_sit"');
$stmt->execute();
$rs = $stmt->fetch(\PDO::FETCH_ASSOC);
$stmt->closeCursor();

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

@@ -123,7 +123,7 @@
</form>
<form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_empty', { 'bas_id' : bas_id }) }}">
<button type="button" class="btn confirm submiter" data-confirm-msg="{{ 'admin::base:collection: etes vous sur de vider la collection ?' | trans }}">
<button type="button" class="btn confirm submiter reload" data-confirm-msg="{{ 'admin::base:collection: etes vous sur de vider la collection ?' | trans }}">
<img src="/skins/icons/trash.png" />
{{ 'admin::base:collection: vider la collection' | trans }}
</button>
@@ -331,7 +331,7 @@
success: function(datas) {
if(datas.success) {
if(submitLink.hasClass('reload')) {
reloadTree('base:{{ collection.get_sbas_id() }}', true);
reloadTree('collection:{{ collection.get_base_id() }}', true);
} else if(submitLink.hasClass('reload-tree')) {
reloadTree('bases:bases', true);
}

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

@@ -146,7 +146,7 @@
</form>
<form style="display:inline;" method="post" action="{{ path('admin_database_empty', {'databox_id': databox.get_sbas_id()}) }}">
<button type="button" class="btn submiter confirm" data-confirm-msg="{{ 'admin::base: Confirmer le vidage complet de la base' | trans }}">
<button type="button" class="btn submiter confirm reload" data-confirm-msg="{{ 'admin::base: Confirmer le vidage complet de la base' | trans }}">
<img src="/skins/icons/trash.png" />
{{ "admin::base: vider la base" | trans }}
</button>

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

@@ -151,8 +151,8 @@
});
if(click === true)
{
if($('#tree li.selected').length > 0)
$('#tree li.selected a').trigger('click');
if($('#tree .selected').length > 0)
$('#tree .selected a').trigger('click');
else
$('.zone_online_users').trigger('click');
}

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

@@ -163,8 +163,14 @@
or collection.get_base_id() in app['acl'].get(app['authentication'].getUser()).get_granted_base(['manage'])|keys
or collection.get_base_id() in app['acl'].get(app['authentication'].getUser()).get_granted_base(['modify_struct'])|keys) %}
{% if feature == 'collection' and featured == collection.get_base_id() %}
{% set coll_selected = true %}
{% else %}
{% set coll_selected = false %}
{% endif %}
<li>
<div style="padding:0 0 2px 0;">
<div style="padding:0 0 2px 0;" {% if coll_selected %}class="selected"{% endif %}>
<a target="right" href="{{ path('admin_display_collection', { 'bas_id' : collection.get_base_id() }) }}" class="ajax">
<span>{{ collection.get_name() }}</span>
</a>

16
templates/web/email-template.html.twig
View File

@@ -22,22 +22,22 @@
<title>{{ subject }}</title>
</head>
<body style="margin:0;padding:0;background-color:#f2f2f2;">
<table width="100%" bgcolor="#f2f2f2;" cellpadding="0" cellspacing="0" border="0" style="margin:0; padding:0; width:100% !important; line-height: 100% !important;background-color:#f2f2f2;">
<table width="100%" bgcolor="#f2f2f2;" cellpadding="0" cellspacing="0" border="0" style="margin:0; padding:0; width:100% !important; line-height: 120% !important;background-color:#f2f2f2;">
<tr>
<td height="40" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:12px; font-weight:normal; color:#999999;line-height:20px;">
<td height="40" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:12px; font-weight:normal; color:#999999;line-height:15px;">
{{ 'Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur.' | trans }}
</td>
</tr>
<tr>
<td valign="center" align="center">
<!-- Wrapper Table: to control the width and the background color consistently, instead of setting attributes on the body tag. -->
<table width="90%" bgcolor="#ffffff;" cellpadding="0" cellspacing="0" border="0" style="margin:0; padding:0; width:90% !important; line-height: 100% !important;background-color:#ffffff;">
<table width="90%" bgcolor="#ffffff;" cellpadding="0" cellspacing="0" border="0" style="margin:0; padding:0; width:90% !important; line-height: 120% !important;background-color:#ffffff;">
<tr>
<td style="border-bottom: 1px solid #f2f2f2;">
<!-- Header table -->
<table width="80%" cellpadding="0" cellspacing="0" border="0" align="center" style="width:80% !important;">
<tr>
<td height="180" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:22px; font-weight:normal; color:#000;">
<td height="180" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:22px; line-height:27px; font-weight:normal; color:#000;">
{% if logoUrl is not none %}
<img src="{{ logoUrl }}" alt="{{ logoText }}" title="{{ logoText }}" height="180" style="display:block; outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;" />
{% else %}
@@ -50,7 +50,7 @@
<!-- Subject table -->
<table width="90%" cellpadding="0" cellspacing="0" border="0" align="center" style="width:90% !important;">
<tr style="background-color:#a6aab0">
<td height="50" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:16px; font-weight:bold; color:#ffffff;">
<td height="50" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:16px; line-height:19px; font-weight:bold; color:#ffffff;">
{{ subject }}
</td>
</tr>
@@ -66,7 +66,7 @@
<td height="15" valign="center" align="center" style="font-size:0px;"></td>
</tr>
<tr>
<td height="115" valign="center" align="left" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:15px; color:#999999;">
<td height="115" valign="center" align="left" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:15px; line-height:18px; color:#999999;">
{% if senderName is not none and senderMail is not none %}
{{ senderName }} - <a href="mailto:{{ senderMail }}" target="_blank" style="color:#FFA500; color:#FFA500 !important; text-decoration:underline; cursor:pointer;">
<span style="color:#FFA500; color:#FFA500 !important; text-decoration:underline; cursor:pointer;">{{ senderMail }}</span></a><br/>
@@ -105,7 +105,7 @@
{% endif %}
{% if expiration is not none %}
<tr>
<td height="60" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:13px; color:#999999;">
<td height="60" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:13px; line-height:16px; color:#999999;">
Ce lien est valable jusqu'au {{ app['date-formatter'].getDate(expiration) }} {{ app['date-formatter'].getTime(expiration) }}
</td>
</tr>
@@ -124,7 +124,7 @@
</td>
</tr>
<tr>
<td height="50" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:12px; color:#999999;">
<td height="50" valign="center" align="center" style="font-family: Helvetica, Tahoma, Arial, sans-serif; font-size:12px; line-height: 15px; color:#999999;">
{{ 'Message automatique de Phraseanet' | trans }}<br />
{% set link %}
<a href="{{ phraseanetURL }}" target="_blank" style="font-weight:bold; cursor:pointer; color:#999999;">

9
www/skins/admin/css/Main.css
View File

@@ -283,3 +283,12 @@ div.switch_right.unchecked {
margin: 10px 0;
line-height: 22px;
}
#tab_demandes .dl-horizontal dd {
word-break: break-all;
margin-left: 140px;
}
#tab_demandes .dl-horizontal dt {
width: 130px;
}