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

Merge branch '3.8'

Browse Source 
Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig
This commit is contained in:
Romain Neutron
2013-12-02 18:17:38 +01:00
parent 845a53f545 7285717b80
commit 4f31cfeefc
14 changed files with 95 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/scripts/apps/admin/fields/views/edit.js
View File

@@ -195,7 +195,8 @@ define([
AdminFieldApp.fieldsToDelete.push(self.model);
AdminFieldApp.fieldListView.collection.remove(self.model);
self._selectModelView(index);
AdminFieldApp.saveView.updateStateButton();
// Enable state button, models is out of sync
AdminFieldApp.saveView.updateStateButton(false);
});
return this;

5
www/scripts/apps/admin/fields/views/save.js
View File

@@ -84,8 +84,9 @@ define([
return this;
},
updateStateButton: function () {
this._disableSaveButton(!this._isModelDesync());
updateStateButton: function (disable) {
var toDisable = disable || !this._isModelDesync();
this._disableSaveButton(toDisable);
},
// check whether model has changed or not
_isModelDesync: function () {

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

@@ -1784,6 +1784,11 @@ H4 {
margin: 0 0 0 10px;
}
#searchForm input.input-small.datepicker::-webkit-input-placeholder { font-size:12px; }
#searchForm input.input-small.datepicker::-moz-placeholder { font-size:12px; } /* firefox 19+ */
#searchForm input.input-small.datepicker:-ms-input-placeholder { font-size:12px; } /* ie */
#searchForm input.input-small.datepicker:-moz-placeholder { font-size:12px; }
#adv_search .sbasglob hr,
.adv_options .sbasglob hr,
.adv_options #sbasfiltercont hr {

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

@@ -1814,6 +1814,11 @@ H4 {
margin: 0 0 0 10px;
}
#searchForm input.input-small.datepicker::-webkit-input-placeholder { font-size:12px; }
#searchForm input.input-small.datepicker::-moz-placeholder { font-size:12px; } /* firefox 19+ */
#searchForm input.input-small.datepicker:-ms-input-placeholder { font-size:12px; } /* ie */
#searchForm input.input-small.datepicker:-moz-placeholder { font-size:12px; }
#adv_search .sbasglob hr,
.adv_options .sbasglob hr,
.adv_options #sbasfiltercont hr {