hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

adressed comment's

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-07-04 02:49:11 +02:00
parent e20e21a3d9
commit 5e151e632a
11 changed files with 20 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,16 +6,16 @@
{% block stylesheet %}
{{ parent() }}
<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/geonames/geonames.css' }) }}">
{#<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/geonames/geonames.css' }) }}">#}
{% endblock %}
{% 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,skins/geonames/geonames.js' }) }}"></script>
<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">
$(document).ready(function() {
var geocompleter = geonames.init($("#form_geonameid"), {
"server": "{{ app['phraseanet.registry'].get('GV_i18n_service') }}",
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
});
@@ -105,7 +105,7 @@
<div class="control-group">
<label class="form_label control-label" for="form_city"><strong>{% trans "admin::compte-utilisateur ville" %}</strong></label>
<div class="controls">
<input class="input_element input-xlarge geoname_field" type="text" name="form_geonameid" id="form_geonameid" value="" />
<input class="input_element input-xlarge geoname_field" type="text" name="form_geonameid" id="form_geonameid" value="{{ app["authentication"].getUser().get_geonameid() }}" />
<p class="form_alert help-block"></p>
</div>
</div>

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

@@ -1,4 +1,5 @@
{% set jquery_theme = 'dark-hive' %}
{% set module = '' %}
{% extends "common/index_bootstrap.html.twig" %}

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

@@ -563,20 +563,20 @@
</div>
</div>
<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,skins/geonames/geonames.js' }) }}"></script>
<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();
geonames.init($('#user_infos_tab input.geoname_field'), {
"server": "{{ app['phraseanet.registry'].get('GV_i18n_service') }}",
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
});
$('div.tabs').tabs();
$('#users_rights_form button#reset_rights').bind('click', function(){
if(confirm("{% trans'are you sure you want reset rights ?' %}"))
if(confirm("{% trans'Are you sure you want to reset rights?' %}"))
{
var users = $('#users_rights_form input[name="users"]').val();

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

@@ -63,7 +63,7 @@
{% macro choose_title(id, choose_export_title, default_export_title)%}
<div class="buttons_line" style="display:{% if choose_export_title %}{% else %}none{% endif %}; text-align: left;">
<p>{% trans 'Nom des fichiers a l\'export'%}</p>
<div classe="well-small">
<div class="well-small">
<label for="type_{{id}}_original" class="radio">
<input type="radio" name="type" id="type_{{id}}_original" {% if default_export_title == "title" %}checked{% endif %} value="title" />
{% trans 'export::titre: titre du documument' %}
@@ -498,7 +498,7 @@
{% endif %}
</div>
<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,skins/geonames/geonames.js' }) }}"></script>
<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)
@@ -615,7 +615,7 @@
});
geonames.init($('#command_geoname_field'), {
"server": "{{ app['phraseanet.registry'].get('GV_i18n_service') }}",
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
});

2
templates/web/login/register-classic.html.twig
View File

@@ -30,7 +30,7 @@
name="registerForm"
method="POST"
action="{{ path("login_register_classic") }}"
data-geonames-server-adress="{{ app['phraseanet.registry'].get('GV_i18n_service') }}"
data-geonames-server-adress="{{ app['geonames.server-uri'] }}"
>
{% if form.vars.errors|length > 0 %}
<div class="row-fluid">

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

@@ -61,11 +61,11 @@
</form>
</div>
<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,skins/geonames/geonames.js' }) }}"></script>
<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() {
geonames.init($('#QuickAddUser input.geoname_field'), {
"server": "{{ app['phraseanet.registry'].get('GV_i18n_service') }}",
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
});

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

@@ -79,7 +79,7 @@
.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right;}
</style>
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,skins/geonames/geonames.css,include/jquery.image_enhancer.css' }) }}" >
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,include/jquery.image_enhancer.css' }) }}" >
<link id="skinCss" type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/prod/' ~ cssfile ~ '/prodcolor.css' }) }}" >
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/humane-js/themes/libnotify.css,skins/prod/Prod.css,skins/prod/Basket.css,skins/prod/Push.css' }) }}" >

3
www/scripts/apps/login/home/config.js
View File

@@ -18,8 +18,7 @@ require.config({
i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
bootstrap: "../skins/build/bootstrap/js/bootstrap.min",
multiselect: "../assets/bootstrap-multiselect/js/bootstrap-multiselect",
"jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames",
geonames: "../skins/geonames/geonames"
"jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames"
},
shim: {
bootstrap : ["jquery"],

2
www/scripts/apps/login/home/register.js
View File

@@ -13,7 +13,7 @@ require([
"i18n",
"apps/login/home/common",
"common/forms/views/formType/passwordSetter",
"geonames"
"common/geonames"
], function($, i18n, Common, RegisterForm, geonames) {
var fieldsConfiguration = [];

4
www/skins/geonames/geonames.js → www/scripts/common/geonames.js
View File

@@ -1,4 +1,4 @@
(function (root, factory) {
;(function (root, factory) {
if (typeof define === 'function' && define.amd) {
define([''], factory);
} else {
@@ -9,6 +9,8 @@
init: function($field, options) {
var geocompleter = $field.geocompleter(options);
var geonameId = $field.val();
// On focus add select-state
geocompleter.geocompleter("autocompleter", "on", "autocompletefocus", function(event, ui) {

52
www/skins/geonames/geonames.css
View File

@@ -1,52 +0,0 @@
.geocompleter-menu {
max-height: 180px;
overflow: auto;
background: #666;
box-shadow: 0 0 15px rgba(0, 0, 0, 1);
-webkit-box-shadow: 0 0 15px rgba(0, 0, 0, 1);
-moz-box-shadow: 0 0 15px rgba(0, 0, 0, 1);
list-style-type: none;
}
.geocompleter-menu li.ui-menu-item.selected {
border: 2px solid #46a546;
}
.geocompleter-menu .ui-menu-item a {
color: #fff;
}
.geocompleter-menu .ui-menu-item a.ui-state-focus,
.geocompleter-menu .ui-menu-item a.ui-state-hover,
.geocompleter-menu .ui-menu-item a.ui-state-active {
text-decoration: none;
background: none;
border:none;
}
.geocompleter-menu .ui-menu-item {
padding: 5px 10px;
}
.geocompleter-menu .ui-menu-item:nth-child(odd) {
background: #444444;
}
.geocompleter-menu .region {
font-size: 11px;
font-style: italic;
display: block;
}
.geocompleter-menu .highlight {
background: #46a546;
}
.geocompleter-input.input-loading {
background: url('/skins/icons/loaderFFF.gif') center right no-repeat;
}
.geocompleter-input.input-error {
color: red !important;
}