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

Fix latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-06-24 14:56:09 +02:00
parent 4b033353bf
commit 5e2dd0216a
14 changed files with 203 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3134,7 +3134,6 @@ dans l'onglet thesaurus : arbres, menus contextuels
}
.PushBox .theme-bg .btn,
#modal_feed form .btn,
#QuickAddUser .btn {
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px;
@@ -3145,22 +3144,16 @@ dans l'onglet thesaurus : arbres, menus contextuels
}
.PushBox .theme-bg .btn-inverse,
#modal_feed form .btn-inverse,
#QuickAddUser .btn-inverse {
*border: 1px solid #515151;
color: #AAAAAA;
}
.PushBox .theme-bg .btn-inverse:hover,
#modal_feed form .btn-inverse:hover,
#QuickAddUser .btn-inverse:hover {
color: #FFFFFF;
}
#modal_feed form .fields {
overflow: auto;
}
#modal_feed form .feeds {
overflow: auto;
}
@@ -3201,26 +3194,6 @@ dans l'onglet thesaurus : arbres, menus contextuels
border: 1px solid red;
}
#modal_feed form input,
#modal_feed form textarea {
width: 90%;
height: 20px;
margin: 3px 0 10px 0;
}
#modal_feed form label {
display:inline;
}
#modal_feed form input.checkbox {
width: 20px;
}
#modal_feed form textarea {
height: 60px;
resize: none;
}
/******* FEEDS ****************************************************************/
#answers .feed {

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

@@ -3206,7 +3206,6 @@ dans l'onglet thesaurus : arbres, menus contextuels
}
.PushBox .theme-bg .btn-inverse,
#modal_feed form .btn-inverse,
#QuickAddUser .btn-inverse {
background-color: #D6D6D6;
*background-color: #D6D6D6;
@@ -3226,7 +3225,6 @@ dans l'onglet thesaurus : arbres, menus contextuels
}
.PushBox .theme-bg .btn-inverse:hover,
#modal_feed form .btn-inverse:hover,
#QuickAddUser .btn-inverse:hover {
background-color: #D6D6D6;
*background-color: #D6D6D6;
@@ -3234,10 +3232,6 @@ dans l'onglet thesaurus : arbres, menus contextuels
color: #FFFFFF;
}
#modal_feed form .fields {
overflow:auto;
}
#modal_feed form .feeds {
color: #333333;
overflow: auto;
@@ -3281,26 +3275,6 @@ dans l'onglet thesaurus : arbres, menus contextuels
border: 1px solid red;
}
#modal_feed form input,
#modal_feed form textarea {
width: 90%;
height: 20px;
margin: 3px 0 10px 0;
}
#modal_feed form label {
display:inline;
}
#modal_feed form input.checkbox {
width: 20px;
}
#modal_feed form textarea {
height: 60px;
resize: none;
}
/******* FEEDS ****************************************************************/
#answers .feed {

81
www/skins/prod/jquery.main-prod.js
View File

@@ -1848,7 +1848,6 @@ function activeIcons() {
});
function feedThis(type, value) {
var $feed_box = $('#modal_feed');
var options = {
lst: '',
ssel: '',
@@ -2747,35 +2746,12 @@ function autoorder() {
}
function set_up_feed_box(data) {
var $feed_box = $('#modal_feed');
$feed_box.empty().append(data).dialog({
modal: true,
width: 800,
height: 500,
resizable: false,
draggable: false
});
var $feeds_item = $('.feeds .feed', $feed_box);
var $form = $('form.main_form', $feed_box);
$feeds_item.bind('click',function () {
$feeds_item.removeClass('selected');
$(this).addClass('selected');
$('input[name="feed_id"]', $form).val($('input', this).val());
}).hover(function () {
$(this).addClass('hover');
}, function () {
$(this).removeClass('hover');
});
$form.bind('submit', function () {
return false;
});
$('button.valid_form').bind('click', function () {
var buttons = {};
buttons[language.valider] = function () {
var dialog = p4.Dialog.get(1);
var error = false;
var $form = $('form.main_form', dialog.getDomElement());
$('.required_text', $form).each(function (i, el) {
if ($.trim($(el).val()) === '') {
@@ -2803,23 +2779,23 @@ function set_up_feed_box(data) {
data: $form.serializeArray(),
dataType: 'json',
beforeSend: function () {
$('button', $feed_box).attr('disabled', 'disabled');
$('button', dialog.getDomElement()).attr('disabled', 'disabled');
},
error: function () {
$('button', $feed_box).removeAttr('disabled');
$('button', dialog.getDomElement()).removeAttr('disabled');
},
timeout: function () {
$('button', $feed_box).removeAttr('disabled');
$('button', dialog.getDomElement()).removeAttr('disabled');
},
success: function (data) {
$('button', $feed_box).removeAttr('disabled');
$('button', dialog.getDomElement()).removeAttr('disabled');
if (data.error === true) {
alert(data.message);
return;
}
if ($('form.main_form', $feed_box).hasClass('entry_update')) {
var id = $('form input[name="entry_id"]', $feed_box).val();
if ($('form.main_form', dialog.getDomElement()).hasClass('entry_update')) {
var id = $('form input[name="entry_id"]', dialog.getDomElement()).val();
var container = $('#entry_' + id);
container.replaceWith(data.datas);
@@ -2833,20 +2809,39 @@ function set_up_feed_box(data) {
});
}
if ($feed_box.data("ui-dialog")) {
$feed_box.dialog('destroy');
}
p4.Dialog.Close(1);
}
});
return false;
});
$('button.close_dialog').bind('click', function () {
if ($feed_box.data("ui-dialog")) {
$feed_box.dialog('destroy');
}
p4.Dialog.Close(1);
};
var dialog = p4.Dialog.Create({
size: 'Full',
closeOnEscape: true,
closeButton: true,
buttons: buttons
});
dialog.setContent(data);
var $feeds_item = $('.feeds .feed', dialog.getDomElement());
var $form = $('form.main_form', dialog.getDomElement());
$feeds_item.bind('click',function () {
console.log("clcik");
$feeds_item.removeClass('selected');
$(this).addClass('selected');
$('input[name="feed_id"]', $form).val($('input', this).val());
}).hover(function () {
$(this).addClass('hover');
}, function () {
$(this).removeClass('hover');
});
$form.bind('submit', function () {
return false;
});
return;
}