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
This commit is contained in:
Romain Neutron
2013-08-08 11:06:59 +02:00
parent 7cb65b0ebb 27a14eb8dd
commit 2be961e28c
21 changed files with 85 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -28,7 +28,7 @@
"neutron/silex-filesystem-provider": "~1.0",
"neutron/sphinxsearch-api" : "~2.0.6",
"neutron/recaptcha" : "~0.1.0",
"neutron/temporary-filesystem" : "~2.0",
"neutron/temporary-filesystem" : "~2.1",
"php-xpdf/php-xpdf" : "~0.2.1",
"phpexiftool/phpexiftool" : "~0.3",
"silex/silex" : "~1.0.0",

5
lib/Alchemy/Phrasea/Command/RecordAdd.php
View File

@@ -81,7 +81,7 @@ class RecordAdd extends Command
if ($input->getOption('in-place') !== '1') {
$originalName = pathinfo($file, PATHINFO_BASENAME);
$tempfile = tempnam(sys_get_temp_dir(), 'addrecord') . '.' . pathinfo($file, PATHINFO_EXTENSION);
$tempfile = $this->container['temporary-filesystem']->createTemporaryFile('add_record', null, pathinfo($file, PATHINFO_EXTENSION));
$this->container['monolog']->addInfo(sprintf('copy file from `%s` to temporary `%s`', $file, $tempfile));
$this->container['filesystem']->copy($file, $tempfile, true);
$file = $tempfile;
@@ -97,6 +97,7 @@ class RecordAdd extends Command
if ($input->getOption('force')) {
switch ($input->getOption('force')) {
default:
$this->container['temporary-filesystem']->clean('add_record');
throw new \InvalidArgumentException(sprintf('`%s` is not a valid force option', $input->getOption('force')));
break;
case 'record':
@@ -130,7 +131,7 @@ class RecordAdd extends Command
if ($tempfile) {
$this->container['monolog']->addInfo(sprintf('Remove temporary file `%s`', $tempfile));
$this->container['filesystem']->remove($tempfile);
$this->container['temporary-filesystem']->clean('add_record');
}
return;

1
lib/Alchemy/Phrasea/Core/Configuration/Configuration.php
View File

@@ -231,6 +231,7 @@ class Configuration implements ConfigurationInterface
}
}
unlink($tmpFile);
throw new RuntimeException(sprintf('Unable to write %s', $file));
}

6
lib/Alchemy/Phrasea/Core/Provider/TemporaryFilesystemServiceProvider.php
View File

@@ -12,6 +12,7 @@
namespace Alchemy\Phrasea\Core\Provider;
use Neutron\TemporaryFilesystem\TemporaryFilesystem;
use Neutron\TemporaryFilesystem\Manager;
use Silex\Application;
use Silex\ServiceProviderInterface;
@@ -19,9 +20,12 @@ class TemporaryFilesystemServiceProvider implements ServiceProviderInterface
{
public function register(Application $app)
{
$app['temporary-filesystem'] = $app->share(function (Application $app) {
$app['temporary-filesystem.temporary-fs'] = $app->share(function (Application $app) {
return new TemporaryFilesystem($app['filesystem']);
});
$app['temporary-filesystem'] = $app->share(function (Application $app) {
return new Manager($app['temporary-filesystem.temporary-fs'], $app['filesystem']);
});
}
public function boot(Application $app)

10
lib/conf.d/bases_structure.xml
View File

@@ -3518,11 +3518,9 @@
<field>
<name>usr_sexe</name>
<type>int(1) unsigned</type>
<null></null>
<null>YES</null>
<extra></extra>
<default>0</default>
<default></default>
<comment></comment>
</field>
<field>
@@ -4013,7 +4011,7 @@
<default>
<data key="usr_id">null</data>
<data key="ldap_created">2</data>
<data key="usr_sexe">0</data>
<data key="usr_sexe">null</data>
<data key="usr_login">autoregister</data>
<data key="usr_password">autoregister</data>
<data key="usr_creationdate">NOW()</data>
@@ -4032,7 +4030,7 @@
<default>
<data key="usr_id">null</data>
<data key="ldap_created">2</data>
<data key="usr_sexe">0</data>
<data key="usr_sexe">null</data>
<data key="usr_login">invite</data>
<data key="usr_password">invite</data>
<data key="usr_creationdate">NOW()</data>

1
templates/web/account/account.html.twig
View File

@@ -46,6 +46,7 @@
<label class="form_label control-label" for="form_gender"><strong>{% trans "admin::compte-utilisateur sexe" %}</strong></label>
<div class="controls">
<select name="form_gender" class="input-xlarge">
<option value=""></option>
<option {% if app["authentication"].getUser().get_gender() == "0" %}selected{% endif %} value="0" >
{% trans "admin::compte-utilisateur:sexe: mademoiselle" %}
</option>

6
templates/web/lightbox/IE6/feed.html.twig
View File

@@ -32,7 +32,7 @@
</tr>
</table>
</div>
<div class="container left">
<div class="lightbox_container left">
{% if first_item %}
{% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %}
{% set preview = first_item.get_record().get_preview() %}
@@ -62,7 +62,7 @@
</tr>
</table>
</div>
<div class="container left">
<div class="lightbox_container left">
</div>
</div>
</div>
@@ -80,7 +80,7 @@
<div class="right_column_wrapper right_column_wrapper_caption left unselectable" style="width:230px;height:auto;">
<div id="record_infos">
<div class="container">
<div class="lightbox_container">
{% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %}
{% if first_item %}
{{caption.format_caption(first_item.get_record(), '', null, business)}}

6
templates/web/lightbox/IE6/validate.html.twig
View File

@@ -34,7 +34,7 @@
</tr>
</table>
</div>
<div class="container left">
<div class="lightbox_container left">
{% if basket_element %}
{% set bask_prev = basket_element.getRecord(app).get_preview() %}
@@ -68,7 +68,7 @@
</tr>
</table>
</div>
<div class="container left">
<div class="lightbox_container left">
</div>
</div>
</div>
@@ -92,7 +92,7 @@
<div class="right_column_wrapper right_column_wrapper_caption left unselectable" style="width:230px;height:auto;{% if basket.getValidation() %}display:none;{% endif %}">
<div id="record_infos">
<div class="container">
<div class="lightbox_container">
{% if basket_element %}
{% set business = app['authentication'].getUser().ACL().has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %}
{{caption.format_caption(basket_element.getRecord(app), '', null, business)}}

6
templates/web/lightbox/feed.html.twig
View File

@@ -40,7 +40,7 @@
</tr>
</table>
</div>
<div class="container PNB record_display_box">
<div class="lightbox_container PNB record_display_box">
{% if first_item %}
{% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %}
{% set bask_prev = first_item.get_record().get_preview() %}
@@ -70,7 +70,7 @@
</tr>
</table>
</div>
<div class="container PNB record_display_box">
<div class="lightbox_container PNB record_display_box">
</div>
</div>
</div>
@@ -80,7 +80,7 @@
</div>
<div class="right_column_wrapper caption right_column_wrapper_caption PNB">
<div id="record_infos" class="PNB">
<div class="container PNB">
<div class="lightbox_container PNB">
{% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %}
{% if first_item %}
{{caption.format_caption(first_item.get_record(), '', null, business)}}

6
templates/web/lightbox/validate.html.twig
View File

@@ -47,7 +47,7 @@
</tr>
</table>
</div>
<div class="container PNB record_display_box">
<div class="lightbox_container PNB record_display_box">
{% if basket_element %}
{% set bask_prev = basket_element.getRecord(app).get_preview() %}
@@ -81,7 +81,7 @@
</tr>
</table>
</div>
<div class="container PNB record_display_box">
<div class="lightbox_container PNB record_display_box">
</div>
</div>
</div>
@@ -95,7 +95,7 @@
</div>
<div class="right_column_wrapper caption right_column_wrapper_caption PNB" style="{% if basket.getValidation() %}display:none;{% endif %}">
<div id="record_infos" class="PNB">
<div class="container PNB">
<div class="lightbox_container PNB">
{% if basket_element %}
{% set business = app['authentication'].getUser().ACL().has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %}
{{caption.format_caption(basket_element.getRecord(app), '', null, business)}}

6
templates/web/login/include/cooliris-content.html.twig
View File

@@ -1,6 +1,6 @@
<div class="row-fluid">
<div class="span12" style="height:360px;">
<object id="o" width="100%" height="360px"
<div class="span12" style="height:400px;">
<object id="o" width="100%" height="100%"
classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
>
<param name="wmode" value="transparent">
@@ -14,7 +14,7 @@
src="https://apps.cooliris.com/embed/cooliris.swf"
flashvars="feed=/feeds/cooliris/&glowColor=#0077BC&style=dark&backgroundColor=#000000&showChrome=false&showEMbed=false&showSearch=false"
width="100%"
height="360"
height="100%"
allowFullScreen="true"
allowScriptAccess="always">
</embed>

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

@@ -3,8 +3,8 @@
{% import "common/macros.html.twig" as macro %}
{% import "login/common/macros.html.twig" as auth_macro %}
{% block title %}
{{ instance_title }}
{% block main_title %}
{{ instance_title|default('Phraseanet') }}
{% endblock %}
{% block header_rss %}

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

@@ -277,7 +277,7 @@
<div class="PNB" id="rightFrame" style="left:auto; width:{{ w2 ~ '%' }}">
<div id="headBlock" class="PNB" style="height: 90px; bottom: auto;">
<div style="margin: 15px auto; line-height: 30px; width: 580px;">
<form id="searchForm" 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">
<div class="input-append">
<input autocomplete="off" class="search query" id="EDIT_query" name="qry" type="text" name="qry" value="{{app['authentication'].getUser().getPrefs('start_page_query')}}">
<a href="#" class="btn btn-inverse adv_trigger adv_search_button">

3
templates/web/prod/upload/upload.html.twig
View File

@@ -386,7 +386,8 @@ $(document).ready(function () {
//get form datas attached to the file
data.formData = $.extend(
data.context.find('input, select').serializeArray(),
UploaderManager.getSettingsBox().find('.collection-status:visible input, select').serializeArray()
$("input", $('.collection-status:visible', UploaderManager.getSettingsBox())).serializeArray(),
$("select", UploaderManager.getSettingsBox()).serializeArray()
);
//remove current context

2
tests/Alchemy/Tests/Phrasea/Core/Provider/TemporaryFilesystemServiceProviderTest.php
View File

@@ -10,7 +10,7 @@ class TemporaryFilesystemServiceProvidertest extends ServiceProviderTestCase
public function provideServiceDescription()
{
return array(
array('Alchemy\Phrasea\Core\Provider\TemporaryFilesystemServiceProvider', 'temporary-filesystem', 'Neutron\TemporaryFilesystem\TemporaryFilesystem'),
array('Alchemy\Phrasea\Core\Provider\TemporaryFilesystemServiceProvider', 'temporary-filesystem', 'Neutron\TemporaryFilesystem\TemporaryFilesystemInterface'),
);
}
}

24
www/skins/lightbox/jquery.lightbox.ie6.js
View File

@@ -42,7 +42,7 @@ $(document).ready(function(){
// $('.right_column_wrapper').height(right_column_wrapper_height);
$('.record_display_box').each(function(i,n){
$('.container',n).height($(n).innerHeight() - $('.header').outerHeight());
$('.lightbox_container',n).height($(n).innerHeight() - $('.header').outerHeight());
});
display_record($('#record_compare').css('visibility') != 'hidden');
}
@@ -100,7 +100,7 @@ $(document).ready(function(){
}
set_sizeable($('#record_main .container, #record_compare .container'));
set_sizeable($('#record_main .lightbox_container, #record_compare .lightbox_container'));
$('#navigation')
.bind('change',
@@ -347,7 +347,7 @@ function display_basket_element(compare, sselcont_id)
text : true
}).bind('click',function()
{
if($('.container', container).hasClass('note_editing'))
if($('.lightbox_container', container).hasClass('note_editing'))
{
hide_notes(container);
}
@@ -393,7 +393,7 @@ function display_basket_element(compare, sselcont_id)
get_next();
});
$('.container', container).bind('dblclick',function(event){
$('.lightbox_container', container).bind('dblclick',function(event){
display_record();
});
@@ -430,7 +430,7 @@ function display_basket_element(compare, sselcont_id)
});
display_record(compare);
$('#record_infos, #right_column').show();
$('#record_compare .container').empty();
$('#record_compare .lightbox_container').empty();
}
}
@@ -450,13 +450,13 @@ function set_container_status(status)
function show_notes(container)
{
$('.notes_wrapper', container).animate({top:0});
$('.container', container).addClass('note_editing');
$('.lightbox_container', container).addClass('note_editing');
}
function hide_notes(container)
{
$('.notes_wrapper', container).animate({top:'-100%'});
$('.container', container).removeClass('note_editing');
$('.lightbox_container', container).removeClass('note_editing');
}
function activate_notes(container)
@@ -516,8 +516,8 @@ function display_record(compare)
var main_box = $('#record_main');
var compare_box = $('#record_compare');
var main_record = $('.container .record', main_box);
var compare_record = $('.container .record', compare_box);
var main_record = $('.lightbox_container .record', main_box);
var compare_record = $('.lightbox_container .record', compare_box);
var main_record_width = parseInt($('input[name=width]', main_box).val());
var main_record_height = parseInt($('input[name=height]', main_box).val());
@@ -867,7 +867,7 @@ function save_note(container, button)
success: function(datas){
hide_notes(container);
$('.notes_wrapper', container).remove();
$('.container', container).append(datas.datas);
$('.lightbox_container', container).append(datas.datas);
activate_notes(container);
return;
}
@@ -975,7 +975,7 @@ function scid_click(event, el)
{
container = $('#record_main');
$('#record_infos .container')
$('#record_infos .lightbox_container')
.empty()
.append(data.caption);
@@ -998,7 +998,7 @@ function scid_click(event, el)
.empty()
.append(data.options_html);
$('.container', container).empty()
$('.lightbox_container', container).empty()
.append(data.preview+data.selector_html+data.note_html);

22
www/skins/lightbox/jquery.lightbox.js
View File

@@ -68,7 +68,7 @@ $(document).ready(function(){
}
set_sizeable($('#record_main .container, #record_compare .container'));
set_sizeable($('#record_main .lightbox_container, #record_compare .lightbox_container'));
$('#navigation')
.bind('change',
@@ -350,7 +350,7 @@ function scid_click(event, el)
{
container = $('#record_main');
$('#record_infos .container')
$('#record_infos .lightbox_container')
.empty()
.append(data.caption);
@@ -373,7 +373,7 @@ function scid_click(event, el)
.empty()
.append(data.options_html);
$('.container', container).empty()
$('.lightbox_container', container).empty()
.append(data.preview+data.selector_html+data.note_html);
@@ -401,7 +401,7 @@ function save_note(container, button)
success: function(datas){
hide_notes(container);
$('.notes_wrapper', container).remove();
$('.container', container).append(datas.datas);
$('.lightbox_container', container).append(datas.datas);
activate_notes(container);
return;
}
@@ -433,7 +433,7 @@ function display_basket_element(compare, sselcont_id)
$('.comment_button', options_container).bind('click',function()
{
// $(this).blur();
if($('.container', container).hasClass('note_editing'))
if($('.lightbox_container', container).hasClass('note_editing'))
{
hide_notes(container);
}
@@ -477,7 +477,7 @@ function display_basket_element(compare, sselcont_id)
});
$('.container', container).bind('dblclick',function(event){
$('.lightbox_container', container).bind('dblclick',function(event){
display_record();
});
@@ -520,7 +520,7 @@ function display_basket_element(compare, sselcont_id)
});
display_record(compare);
$('#right_column').show();
$('#record_compare .container').empty();
$('#record_compare .lightbox_container').empty();
}
}
@@ -536,7 +536,7 @@ function show_notes(container)
$('.notes_wrapper', container).animate({
top:0
});
$('.container', container).addClass('note_editing');
$('.lightbox_container', container).addClass('note_editing');
}
function hide_notes(container)
@@ -544,7 +544,7 @@ function hide_notes(container)
$('.notes_wrapper', container).animate({
top:'-100%'
});
$('.container', container).removeClass('note_editing');
$('.lightbox_container', container).removeClass('note_editing');
}
function activate_notes(container)
@@ -808,8 +808,8 @@ function display_record(compare)
var main_box = $('#record_main');
var compare_box = $('#record_compare');
var main_record = $('.container .record', main_box);
var compare_record = $('.container .record', compare_box);
var main_record = $('.lightbox_container .record', main_box);
var compare_record = $('.lightbox_container .record', compare_box);
var main_record_width = parseInt($('input[name=width]', main_box).val());
var main_record_height = parseInt($('input[name=height]', main_box).val());

6
www/skins/lightbox/lightbox.css
View File

@@ -81,7 +81,7 @@ img {
overflow: hidden;
}
.record_display_box .container {
.record_display_box .lightbox_container {
top: 30px;
overflow: hidden;
}
@@ -299,11 +299,11 @@ img {
left: auto;
}
#record_compare .header, #record_compare .container {
#record_compare .header, #record_compare .lightbox_container {
left: 5px;
}
#record_wrapper.comparison #record_main .header, #record_wrapper.comparison #record_main .container {
#record_wrapper.comparison #record_main .header, #record_wrapper.comparison #record_main .lightbox_container {
right: 5px;
}

2
www/skins/lightbox/lightboxie6.css
View File

@@ -43,7 +43,7 @@ ul{
}
.record_display_box .container{
.record_display_box .lightbox_container{
overflow:hidden;
}

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

@@ -490,34 +490,16 @@ span.ww_winTitle {
/******* FORMULAIRE DE RECHERCHE **********************************************/
#searchForm > button.btn {
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px;
font-weight: bold;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
#searchForm .input-append .btn {
border:none;
}
#searchForm > button.btn-inverse {
width: 110px;
#searchForm .input-append a.btn {
height: 22px;
}
#searchForm .input-append button.btn {
height: 30px;
margin-left: 4px;
*border: 1px solid #515151;
color: #AAAAAA;
font-weight: bold;
}
#searchForm > button.btn-inverse:hover {
color: #FFFFFF;
}
#searchForm label {
color: #FFFFFF;
}
#searchForm #recordtype_sel {
margin-left: 10px;
}
/******* PRESENTATION DE MINIATURES *******************************************/
@@ -4087,6 +4069,9 @@ dans l'onglet thesaurus : arbres, menus contextuels
}
#uploadBox .upload-record .infos-doc {
overflow: hidden;
-o-text-overflow: ellipsis; /* pour Opera 9 */
text-overflow: ellipsis;
color: #777777;
height: 40px;
}

52
www/skins/prod/959595/prodcolor.css
View File

@@ -29,7 +29,7 @@ label {
}
legend {
#333333;
color: #333333;
width: auto;
border: none;
}
@@ -501,49 +501,16 @@ span.ww_winTitle {
/******* FORMULAIRE DE RECHERCHE **********************************************/
#searchForm > button.btn {
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px;
font-weight: bold;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
#searchForm .input-append .btn {
border:none;
}
#searchForm > button.btn-inverse {
width: 110px;
#searchForm .input-append a.btn {
height: 22px;
}
#searchForm .input-append button.btn {
height: 30px;
margin-left: 4px;
background-color: #D6D6D6;
*background-color: #D6D6D6;
background-image: -ms-linear-gradient(top, #FFFFFF, #D6D6D6);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#FFFFFF), to(#D6D6D6));
background-image: -webkit-linear-gradient(top, #FFFFFF, #D6D6D6);
background-image: -o-linear-gradient(top, #FFFFFF, #D6D6D6);
background-image: linear-gradient(top, #FFFFFF, #D6D6D6);
background-image: -moz-linear-gradient(top, #FFFFFF, #D6D6D6);
border-color: #D6D6D6 #D6D6D6 #bfbfbf;
border-bottom-color: #b3b3b3;
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#D6D6D6', GradientType=0);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
*border: 1px solid #666666;
text-shadow: none;
color: #777777;
}
#searchForm > button.btn-inverse:hover {
background-color: #D6D6D6;
*background-color: #D6D6D6;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
color: #FFFFFF;
}
#searchForm label {
color: #333333;
}
#searchForm #recordtype_sel {
margin-left: 10px;
}
/******* PRESENTATION DE MINIATURES *******************************************/
@@ -4221,6 +4188,9 @@ dans l'onglet thesaurus : arbres, menus contextuels
}
#uploadBox .upload-record .infos-doc {
overflow: hidden;
-o-text-overflow: ellipsis; /* pour Opera 9 */
text-overflow: ellipsis;
color: #777777;
height: 40px;
}