Browse Source

Merge remote-tracking branch 'upstream/develop' into 1701-index-again

tags/3.5.1
Michael 3 years ago
parent
commit
df28f99caa
8 changed files with 8880 additions and 8419 deletions
  1. +3
    -0
      .gitignore
  2. +9
    -0
      .tx/config
  3. +1
    -1
      mod/cal.php
  4. +1
    -1
      mod/events.php
  5. +6871
    -6510
      view/lang/it/messages.po
  6. +1984
    -1901
      view/lang/it/strings.php
  7. +2
    -2
      view/theme/frio/templates/events_js.tpl
  8. +9
    -4
      view/theme/frio/templates/jot-header.tpl

+ 3
- 0
.gitignore View File

@@ -48,3 +48,6 @@ nbproject
/php_friendica.phpproj
/php_friendica.sln
/php_friendica.phpproj.user

#ignore things from transifex-client
venv/

+ 9
- 0
.tx/config View File

@@ -0,0 +1,9 @@
[main]
host = https://www.transifex.com

[friendica.messagespo]
file_filter = view/lang/<lang>/messages.po
source_file = util/messages.po
source_lang = en
type = PO


+ 1
- 1
mod/cal.php View File

@@ -275,7 +275,7 @@ function cal_content(App $a) {
'$tabs' => $tabs,
'$title' => t('Events'),
'$view' => t('View'),
'$previus' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
'$calendar' => cal($y,$m,$links, ' eventcal'),



+ 1
- 1
mod/events.php View File

@@ -393,7 +393,7 @@ function events_content(App $a) {
'$title' => t('Events'),
'$view' => t('View'),
'$new_event' => array(App::get_baseurl().'/events/new',t('Create New Event'),'',''),
'$previus' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
'$calendar' => cal($y,$m,$links, ' eventcal'),



+ 6871
- 6510
view/lang/it/messages.po
File diff suppressed because it is too large
View File


+ 1984
- 1901
view/lang/it/strings.php
File diff suppressed because it is too large
View File


+ 2
- 2
view/theme/frio/templates/events_js.tpl View File

@@ -34,8 +34,8 @@

{{* The buttons to change the month/weeks/days *}}
<div id="fc-fc-header-left" class="btn-group">
<button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-angle-up" aria-hidden="true"></i></i></button>
<button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-angle-down" aria-hidden="true"></i></i></button>
<button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$previous.1}}"><i class="fa fa-angle-up" aria-hidden="true"></i></i></button>
<button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next.1}}"><i class="fa fa-angle-down" aria-hidden="true"></i></i></button>
<button class="btn btn-eventnav btn-separator" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
</div>



+ 9
- 4
view/theme/frio/templates/jot-header.tpl View File

@@ -29,7 +29,7 @@
$('#character-counter').text(textlen);
});
return;
}
}
tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
@@ -82,7 +82,7 @@
}
else {
$('#profile-jot-desc').html('&nbsp;');
}
}

//Character count

@@ -120,7 +120,7 @@
$("a#jot-perms-icon").colorbox({
'inline' : true,
'transition' : 'elastic'
});
});

} else {
if (typeof cb!="undefined") cb();
@@ -397,13 +397,18 @@
var modal = $('#jot-modal').modal();
jotcache = $("#jot-sections");

// Auto focus on the first enabled field in the modal
modal.on('shown.bs.modal', function (e) {
$('#jot-modal-content').find('select:not([disabled]), input:not([type=hidden]):not([disabled]), textarea:not([disabled])').first().focus();
})

modal
.find('#jot-modal-content')
.append(jotcache)
.modal.show;
}

// the following functions show/hide the specific jot content
// the following functions show/hide the specific jot content
// in dependence of the selected nav
function aclActive() {
$(".modal-body #profile-jot-wrapper, .modal-body #jot-preview-content, .modal-body #jot-fbrowser-wrapper").hide();


Loading…
Cancel
Save