Merge https://github.com/friendica/red into pending_merge
This commit is contained in:
friendica
commit
9b2c71a5dc
@ -46,15 +46,12 @@ function manage_content(&$a) {
|
||||
intval(PAGE_REMOVED)
|
||||
);
|
||||
|
||||
$selected_channel = null;
|
||||
$account = get_app()->get_account();
|
||||
|
||||
if($r && count($r)) {
|
||||
$channels = $r;
|
||||
for($x = 0; $x < count($channels); $x ++) {
|
||||
$channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']);
|
||||
if($channels[$x]['channel_id'] == local_user())
|
||||
$selected_channel = &$channels[$x]; // Needs to be a reference!
|
||||
$channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : '');
|
||||
$channels[$x]['default_links'] = '1';
|
||||
|
||||
@ -152,8 +149,8 @@ function manage_content(&$a) {
|
||||
$o = replace_macros(get_markup_template('channels.tpl'), array(
|
||||
'$header' => t('Channel Manager'),
|
||||
'$msg_selected' => t('Current Channel'),
|
||||
'$selected' => $selected_channel,
|
||||
'$desc' => t('Attach to one of your channels by selecting it.'),
|
||||
'$selected' => local_user(),
|
||||
'$desc' => t('Switch to one of your channels by selecting it.'),
|
||||
'$msg_default' => t('Default Channel'),
|
||||
'$msg_make_default' => t('Make Default'),
|
||||
'$links' => $links,
|
||||
|
||||
@ -73,7 +73,7 @@ function po2php_run($argv, $argc) {
|
||||
}
|
||||
$match=Array();
|
||||
preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
|
||||
$out .= "\t".
|
||||
$out .= "\t".
|
||||
preg_replace_callback($escape_s_exp,'escape_s',$match[1])
|
||||
." => "
|
||||
.preg_replace_callback($escape_s_exp,'escape_s',$match[2]) .",\n";
|
||||
@ -83,7 +83,7 @@ function po2php_run($argv, $argc) {
|
||||
|
||||
|
||||
if ($ink) {
|
||||
$k .= trim($l,"\"\r\n");
|
||||
$k .= trim_message($l);
|
||||
$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
|
||||
//$out .= '$a->strings['.$k.'] = ';
|
||||
}
|
||||
@ -93,7 +93,7 @@ function po2php_run($argv, $argc) {
|
||||
if ($k!="") $out .= $arr?");\n":";\n";
|
||||
$arr=False;
|
||||
$k = str_replace("msgid ","",$l);
|
||||
$k = trim($k,"\"\r\n");
|
||||
$k = trim_message($k);
|
||||
$k = $ctx.$k;
|
||||
// echo $ctx ? $ctx."\nX\n":"";
|
||||
$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
|
||||
@ -102,14 +102,14 @@ function po2php_run($argv, $argc) {
|
||||
}
|
||||
|
||||
if ($inv && substr($l,0,6)!="msgstr" && substr($l,0,7)!="msgctxt") {
|
||||
$v .= trim($l,"\"\r\n");
|
||||
$v .= trim_message($l);
|
||||
$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
|
||||
//$out .= '$a->strings['.$k.'] = ';
|
||||
}
|
||||
|
||||
if (substr($l,0,7)=="msgctxt") {
|
||||
$ctx = str_replace("msgctxt ","",$l);
|
||||
$ctx = trim($ctx,"\"\r\n");
|
||||
$ctx = trim_message($ctx);
|
||||
$ctx = "__ctx:".$ctx."__ ";
|
||||
$ctx = preg_replace_callback($escape_s_exp,'escape_s',$ctx);
|
||||
}
|
||||
@ -123,6 +123,14 @@ function po2php_run($argv, $argc) {
|
||||
|
||||
}
|
||||
|
||||
function trim_message($str) {
|
||||
// Almost same as trim("\"\r\n") except that escaped quotes are preserved
|
||||
$str = trim($str, "\r\n");
|
||||
$str = ltrim($str, "\"");
|
||||
$str = preg_replace('/(?<!\\\)"+$/', '', $str);
|
||||
return $str;
|
||||
}
|
||||
|
||||
if (array_search(__file__,get_included_files())===0){
|
||||
po2php_run($argv,$argc);
|
||||
}
|
||||
|
||||
@ -2,7 +2,10 @@
|
||||
#files-upload-tools,
|
||||
[id^="perms-panel-"] {
|
||||
display: none;
|
||||
padding: 3px 10px 3px 10px !important;
|
||||
}
|
||||
|
||||
[id^="perms-panel-"] {
|
||||
padding: 3px 10px 0px 10px !important;
|
||||
}
|
||||
|
||||
#attach-code,
|
||||
@ -14,19 +17,17 @@
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#cloud-index th {
|
||||
padding-top: 7px;
|
||||
}
|
||||
|
||||
#cloud-index td:nth-child(1){
|
||||
padding: 7px 3px 7px 10px;
|
||||
}
|
||||
|
||||
#cloud-index th:nth-child(8),
|
||||
#cloud-index td:nth-child(8){
|
||||
padding: 7px 3px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
#cloud-index th:nth-child(9),
|
||||
#cloud-index td:nth-child(9){
|
||||
padding: 7px 10px 7px 7px;
|
||||
white-space: nowrap;
|
||||
@ -35,3 +36,7 @@
|
||||
.cloud-index-tool {
|
||||
padding: 7px 10px;
|
||||
}
|
||||
|
||||
#files-upload {
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
#channels-selected {
|
||||
color: #666666;
|
||||
font-size: 0.8em;
|
||||
|
||||
}
|
||||
|
||||
#channels-desc {
|
||||
@ -14,33 +13,23 @@
|
||||
.channels-break {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
#selected-channel {
|
||||
float: left;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.channels-end.selected {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#selected-channel .channel-selection {
|
||||
clear: both;
|
||||
margin: 0 auto 0 auto;
|
||||
}
|
||||
|
||||
.channel-selection-default {
|
||||
font-size: 0.8em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#all-channels .channel-selection {
|
||||
.channel-selection {
|
||||
width: 12em;
|
||||
height: 16em;
|
||||
float: left;
|
||||
margin: 0 15px 15px 0;
|
||||
text-align: center;
|
||||
}
|
||||
.channels-end {
|
||||
clear: both;
|
||||
|
||||
.channel-selection img {
|
||||
display: block;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
.channel-selection-name-link {
|
||||
@ -50,7 +39,6 @@
|
||||
|
||||
.channel-selection-name-link .channel-name {
|
||||
padding-top: 10px;
|
||||
text-align: left;
|
||||
word-wrap: break-word;
|
||||
overflow: hidden;
|
||||
}
|
||||
@ -59,3 +47,7 @@
|
||||
clear: both;
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.selected-channel img {
|
||||
border: 2px solid #ff0000;
|
||||
}
|
||||
|
||||
@ -25,6 +25,5 @@
|
||||
}
|
||||
|
||||
#photos-upload-choose {
|
||||
border: unset;
|
||||
padding: unset;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
8549
view/it/messages.po
8549
view/it/messages.po
File diff suppressed because it is too large
Load Diff
1789
view/it/strings.php
1789
view/it/strings.php
File diff suppressed because it is too large
Load Diff
@ -468,7 +468,7 @@ function updateConvItems(mode,data) {
|
||||
$('#' + prev).after($(this));
|
||||
if(isVisible)
|
||||
showHideComments(itmId);
|
||||
$(".autotime").timeago();
|
||||
$(".autotime",this).timeago();
|
||||
}
|
||||
else {
|
||||
$('img',this).each(function() {
|
||||
@ -479,7 +479,7 @@ function updateConvItems(mode,data) {
|
||||
$('#' + ident).replaceWith($(this));
|
||||
if(isVisible)
|
||||
showHideComments(itmId);
|
||||
$(".autotime").timeago();
|
||||
$(".autotime",this).timeago();
|
||||
}
|
||||
prev = ident;
|
||||
});
|
||||
@ -510,7 +510,7 @@ function updateConvItems(mode,data) {
|
||||
$('#threads-end').before($(this));
|
||||
if(isVisible)
|
||||
showHideComments(itmId);
|
||||
$(".autotime").timeago();
|
||||
$(".autotime",this).timeago();
|
||||
}
|
||||
else {
|
||||
$('img',this).each(function() {
|
||||
@ -521,7 +521,7 @@ function updateConvItems(mode,data) {
|
||||
$('#' + ident).replaceWith($(this));
|
||||
if(isVisible)
|
||||
showHideComments(itmId);
|
||||
$(".autotime").timeago();
|
||||
$(".autotime",this).timeago();
|
||||
}
|
||||
});
|
||||
|
||||
@ -555,7 +555,7 @@ function updateConvItems(mode,data) {
|
||||
$('#' + prev).after($(this));
|
||||
if(isVisible)
|
||||
showHideComments(itmId);
|
||||
$(".autotime").timeago();
|
||||
$(".autotime",this).timeago();
|
||||
|
||||
}
|
||||
prev = ident;
|
||||
|
||||
@ -3,16 +3,6 @@ var ispublic = aStr['everybody'];
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
$("a#photos-upload-perms-menu").colorbox({
|
||||
'inline' : true,
|
||||
'transition' : 'elastic'
|
||||
});
|
||||
|
||||
$("a#settings-default-perms-menu").colorbox({
|
||||
'inline' : true,
|
||||
'transition' : 'elastic'
|
||||
});
|
||||
|
||||
var a;
|
||||
a = $("#photo-edit-newtag").autocomplete({
|
||||
serviceUrl: baseurl + '/acl',
|
||||
|
||||
@ -689,18 +689,6 @@ footer {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
|
||||
color: #8888FF;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#photos-upload-perms-menu:hover {
|
||||
color: #0000FF;
|
||||
text-decoration: underline;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#photo-view-wrapper {
|
||||
background-color: $item_colour;
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
{{include file="field_input.tpl" field=$nav_min_opacity}}
|
||||
{{include file="field_input.tpl" field=$top_photo}}
|
||||
{{include file="field_input.tpl" field=$reply_photo}}
|
||||
{{include file="field_checkbox.tpl" field=$sloppy_photos}}
|
||||
{{*include file="field_checkbox.tpl" field=$sloppy_photos*}}
|
||||
<script>
|
||||
$(function(){
|
||||
$('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker();
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
<li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li>
|
||||
<li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
|
||||
<li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
|
||||
<li><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li>
|
||||
<li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<div class="channel-selection">
|
||||
<div class='channel-selection {{if $selected == $channel.channel_id}}selected-channel{{/if}}'>
|
||||
{{if $channel.default_links}}
|
||||
{{if $channel.default}}
|
||||
<div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div>
|
||||
@ -10,5 +10,3 @@
|
||||
<div class="channels-notifications-wrapper"><a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a> <a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a></div>
|
||||
<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a>
|
||||
</div>
|
||||
|
||||
<div class="channel-selection-end"></div>
|
||||
|
||||
@ -13,14 +13,6 @@
|
||||
{{$channel_usage_message}}
|
||||
</div>
|
||||
{{/if}}
|
||||
{{if $selected}}
|
||||
<div id="selected-channel">
|
||||
<div id="channels-selected">{{$msg_selected}}</div>
|
||||
{{include file="channel.tpl" channel=$selected}}
|
||||
</div>
|
||||
<div class="channels-end selected"></div>
|
||||
{{/if}}
|
||||
<br />
|
||||
<div id="channels-desc" class="descriptive-text">{{$desc}}</div>
|
||||
|
||||
<div id="all-channels">
|
||||
|
||||
@ -2,16 +2,17 @@
|
||||
<label for="files-mkdir">{{$folder_header}}</label>
|
||||
<form method="post" action="">
|
||||
<input type="hidden" name="sabreAction" value="mkcol">
|
||||
<input id="files-mkdir" type="text" name="name">
|
||||
<input type="submit" value="{{$folder_submit}}">
|
||||
<input id="files-mkdir" type="text" name="name" class="form-control form-group">
|
||||
<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button>
|
||||
</form>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
<div id="files-upload-tools" class="section-content-tools-wrapper form-group">
|
||||
<label for="files-upload">{{$upload_header}}</label>
|
||||
<form method="post" action="" enctype="multipart/form-data">
|
||||
<input type="hidden" name="sabreAction" value="put">
|
||||
<input id="files-upload" type="file" name="file" style="display: inline;">
|
||||
<input type="submit" value="{{$upload_submit}}">
|
||||
<input class="pull-left" id="files-upload" type="file" name="file">
|
||||
<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
|
||||
<!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form-->
|
||||
</form>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user