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 geonames amd loading

Browse Source
This commit is contained in:
Nicolas Le Goff
2015-02-06 16:04:18 +01:00
parent dc59f71a6f
commit 5a62787b85
5 changed files with 108 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/conf.d/minifyGroupsConfig.php
View File

@@ -13,6 +13,7 @@ $groups = [
'//include/jslibs/jquery.contextmenu_scroll.js',
'//assets/jquery.cookie/jquery.cookie.js',
'//include/jquery.common.js',
'//assets/requirejs/require.js',
'//skins/account/account.js'
],
'authentication_css' => [

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

@@ -11,17 +11,39 @@
{% block javascript %}
{{ parent() }}
<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : '/skins/account/account.js,assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
<script type="text/javascript">
requirejs.config({
baseUrl: "/scripts",
paths: {
"jquery": "../assets/jquery/jquery",
"jquery.ui": "../assets/jquery.ui/jquery-ui",
"jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames"
},
shim: {
"jquery.geonames": {
deps: ["jquery", "jquery.ui"],
exports: "$.fn.geocompleter"
},
"common/geonames": {
deps: ["jquery.geonames"]
}
}
});
require([
"jquery",
"common/geonames"
], function ($, geonames) {
$(document).ready(function() {
$('legend').bind('click', function () {
$(".form-info").hide(200);
$($(this).data('target')).show();
});
geonames.init($("#form_geonameid"), {
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
});
$('legend').bind('click', function() {
$(".form-info").hide(200);
$($(this).data('target')).show();
});
});
</script>

32
templates/web/admin/editusers.html.twig
View File

@@ -559,11 +559,16 @@
</div>
</div>
<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
<script type="text/javascript">
$(document).ready(function(){
ini_edit_usrs();
define([
"jquery",
"common/geonames"
], function ($, geonames) {
$(document).ready(function() {
ini_edit_usrs();
geonames.init($('#user_infos_tab input.geoname_field'), {
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
@@ -571,21 +576,20 @@
$('div.tabs').tabs();
$('#users_rights_form button#reset_rights').bind('click', function(){
if(confirm("{{ 'Are you sure you want to reset rights?' | trans }}"))
{
$('#users_rights_form button#reset_rights').bind('click', function () {
if (confirm("{{ 'Are you sure you want to reset rights?' | trans }}")) {
var users = $('#users_rights_form input[name="users"]').val();
$.ajax({
type: 'POST',
url: '/admin/users/rights/reset/',
dataType:'json',
dataType: 'json',
data: {
users : users
users: users
},
success: function(data){
if(!data.error) {
if(users === '') {
success: function (data) {
if (!data.error) {
if (users === '') {
return false;
}
@@ -595,9 +599,9 @@
type: 'GET',
url: '/admin/users/rights/',
data: {
users : users
users: users
},
success: function(data){
success: function (data) {
$('#right-ajax').removeClass('loading').html(data);
}
});
@@ -611,4 +615,6 @@
}
});
});
});
</script>

7
templates/web/common/dialog_export.html.twig
View File

@@ -506,7 +506,6 @@
{% endif %}
</div>
<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
<script type="text/javascript">
function check_TOU(container)
@@ -619,10 +618,16 @@
dialog.Close();
});
define([
"common/geonames"
], function (geonames) {
geonames.init($('#command_geoname_field'), {
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
});
});
$('#download .download_button').bind('click',function(){
if(!check_subdefs($('#download')))

16
templates/web/prod/User/Add.html.twig
View File

@@ -61,21 +61,26 @@
</form>
</div>
<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
<script type="text/javascript">
define([
"jquery",
"common/geonames"
], function (geonames) {
$(document).ready(function() {
geonames.init($('#QuickAddUser input.geoname_field'), {
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
});
$("#QuickAddUser button").button();
$quickAddUser = $("#QuickAddUser");
$("#QuickAddUser form").bind('submit', function() {
$("button", $quickAddUser).button();
$("form", $quickAddUser).bind('submit', function() {
return false;
});
$("#QuickAddUser form button.cancel").bind('click', function() {
$("form button.cancel", $quickAddUser).bind('click', function() {
var dialog = $(this).closest('.ui-dialog-content');
if (dialog.data("ui-dialog")) {
dialog.dialog('destroy');
@@ -86,7 +91,7 @@
return false;
});
$("#QuickAddUser form button.valid").bind('click', function() {
$("form button.valid", $quickAddUser).bind('click', function() {
var $form = $(this).closest('form');
var $this = $(this);
@@ -102,4 +107,5 @@
return false;
});
});
});
</script>