harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-10-09 18:39:07 -07:00
commit c782272927
28 changed files with 67 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/bookmarks.php
View File

@ -55,6 +55,8 @@ function bookmarks_content(&$a) {
$o = profile_tabs($a,true,$channel['channel_address']);
$o .= '<div class="generic-content-wrapper">';
$o .= '<h3>' . t('My Bookmarks') . '</h3>';
$x = menu_list(local_user(),'',MENU_BOOKMARK);
@ -78,7 +80,7 @@ function bookmarks_content(&$a) {
}
}
$o .= '</div>';
return $o;

3
mod/profiles.php
View File

@ -766,6 +766,9 @@ logger('extra_fields: ' . print_r($extra_fields,true));
: '<a href="' . $a->get_baseurl(true) . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
));
}
$o .= '</div>';
}
return $o;
}

6
mod/webpages.php
View File

@ -81,6 +81,8 @@ function webpages_content(&$a) {
require_once('include/conversation.php');
$o = profile_tabs($a,true);
$o .= '<div class="generic-content-wrapper">';
$o .= '<h2>' . t('Webpages') . '</h2>';
$x = array(
@ -95,7 +97,7 @@ function webpages_content(&$a) {
'mimetype' => $mimetype,
'layout' => $layout,
);
if($_REQUEST['title'])
$x['title'] = $_REQUEST['title'];
if($_REQUEST['body'])
@ -105,7 +107,6 @@ function webpages_content(&$a) {
$o .= status_editor($a,$x);
// Get a list of webpages. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
//TODO - this should be replaced with pagelist_widget
@ -142,5 +143,6 @@ function webpages_content(&$a) {
));
$o .= '</div>';
}

9
view/theme/redbasic/css/style.css
View File

@ -1864,13 +1864,16 @@ img.mail-list-sender-photo {
.wall-item-content-wrapper {
background-color: $item_colour;
padding: 10px;
}
.wall-item-content-wrapper {
border-top-right-radius: $radiuspx;
border-top-left-radius: $radiuspx;
}
.generic-content-wrapper {
background-color: $genericcontent_bgcolour;
padding: 10px;
border-radius: $radiuspx;
}
.comment .wall-item-body {
padding-left: $comment_padding;
}

3
view/theme/redbasic/php/config.php
View File

@ -25,6 +25,7 @@ function theme_content(&$a) {
$arr['comment_indent'] = get_pconfig(local_user(),'redbasic', 'comment_indent' );
$arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour');
$arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour');
$arr['genericcontent_bgcolour'] = get_pconfig(local_user(),'redbasic', 'genericcontent_bgcolour' );
$arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' );
$arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' );
$arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' );
@ -63,6 +64,7 @@ function theme_post(&$a) {
set_pconfig(local_user(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']);
set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
set_pconfig(local_user(), 'redbasic', 'genericcontent_bgcolour', $_POST['redbasic_genericcontent_bgcolour']);
set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
set_pconfig(local_user(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']);
set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
@ -120,6 +122,7 @@ if(feature_enabled(local_user(),'expert'))
'$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']),
'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']),
'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']),
'$genericcontent_bgcolour' => array('redbasic_genericcontent_bgcolour',t('Set the background color of other content'),$arr['genericcontent_bgcolour']),
'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']),
'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
'$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),

4
view/theme/redbasic/php/style.php
View File

@ -24,6 +24,7 @@ if(! $a->install) {
$background_image = get_pconfig($uid, "redbasic", "background_image");
$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
$genericcontent_bgcolour = get_pconfig($uid, "redbasic", "genericcontent_bgcolour");
$item_colour = get_pconfig($uid, "redbasic", "item_colour");
$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
@ -121,6 +122,8 @@ if(! $a->install) {
$bgcolour = "#fdfdfd";
if (! $background_image)
$background_image ='';
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour ='rgba(247,247,247,0.8)';
if (! $item_colour)
$item_colour = "rgba(238,238,238,0.8)";
if (! $comment_item_colour)
@ -331,6 +334,7 @@ $options = array (
'$search_background' => $search_background,
'$bgcolour' => $bgcolour,
'$background_image' => $background_image,
'$genericcontent_bgcolour' => $genericcontent_bgcolour,
'$item_colour' => $item_colour,
'$comment_item_colour' => $comment_item_colour,
'$comment_border_colour' => $comment_border_colour,

2
view/theme/redbasic/schema/dark.php
View File

@ -50,6 +50,8 @@
$search_background = "#999";
if (! $bgcolour)
$bgcolour = "#111";
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour ='rgba(28,28,28,0.8)';
if (! $item_colour)
$item_colour = "rgba(28,28,28,0.8)";
if (! $comment_item_colour)

4
view/theme/redbasic/schema/simple_black_on_white.php
View File

@ -34,7 +34,7 @@
$navtabs_bgchover = "#fff";
if (! $navtabs_decohover)
$navtabs_decohover = "underline";
if (! $navaside_bghover)
if (! $navaside_bghover)
$navaside_bghover = "#F5F5F5";
if (! $link_colour)
$link_colour = "#000";
@ -50,6 +50,8 @@ if (! $navaside_bghover)
$search_background = "#F5F5F5";
if (! $bgcolour)
$bgcolour = "#fff";
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour = 'rgba(255,255,255,0.8)';
if (! $item_colour)
$item_colour = "rgba(255,255,255,0.8)";
if (! $comment_item_colour)

2
view/theme/redbasic/schema/simple_green_on_black.php
View File

@ -50,6 +50,8 @@ if (! $navaside_bghover)
$search_background = "#000";
if (! $bgcolour)
$bgcolour = "#000";
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour = 'rgba(0,0,0,0.8)';
if (! $item_colour)
$item_colour = "rgba(0,0,0,0.8)";
if (! $comment_item_colour)

2
view/theme/redbasic/schema/simple_white_on_black.php
View File

@ -50,6 +50,8 @@
$search_background = "#000";
if (! $bgcolour)
$bgcolour = "#000";
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour ='rgba(0,0,0,0.8)';
if (! $item_colour)
$item_colour = "rgba(0,0,0,0.8)";
if (! $comment_item_colour)

3
view/theme/redbasic/tpl/theme_settings.tpl
View File

@ -24,6 +24,7 @@
{{include file="field_input.tpl" field=$comment_indent}}
{{include file="field_colorinput.tpl" field=$toolicon_colour}}
{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
{{include file="field_colorinput.tpl" field=$genericcontent_bgcolour}}
{{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_colorinput.tpl" field=$font_colour}}
@ -40,7 +41,7 @@
$('#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();
$('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
$('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour,#id_redbasic_genericcontent_bgcolour').colorpicker({format: 'rgba'});
});
</script>

4
view/tpl/channels.tpl
View File

@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<h3>{{$header}}</h3>
{{if $links}}
{{foreach $links as $l}}
<a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a>
@ -30,3 +30,5 @@
</div>
<div class="channels-end all"></div>
</div>

4
view/tpl/cloud_actionspanel.tpl
View File

@ -20,4 +20,6 @@
</form>
</td>
</tr>
</table>
</table>
</div>

3
view/tpl/cloud_directory.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<h1>{{$header}}</h1>
<table id="cloud-index">
<tr>
@ -40,4 +41,4 @@
{{if $quota.limit || $quota.used}}
<p><strong>{{$total}}</strong> {{$quota.desc}}</p>
{{/if}}
{{/if}}

8
view/tpl/connections.tpl
View File

@ -1,3 +1,5 @@
<div class="generic-content-wrapper">
<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
{{if $finding}}<h4>{{$finding}}</h4>{{/if}}
@ -20,10 +22,6 @@
<div id="page-end"></div>
</div>
<div id="contact-edit-end"></div>
</div>
<script>$(document).ready(function() { loadingPage = false;});</script>
<div id="page-spinner"></div>

4
view/tpl/directory_header.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<h1>{{$dirlbl}}</h1>
{{if $search}}
@ -8,9 +9,8 @@
{{include file="direntry.tpl"}}
{{/foreach}}
<div id="page-end"></div>
<div class="directory-end"></div>
</div>
<script>$(document).ready(function() { loadingPage = false;});</script>
<div id="page-spinner"></div>

2
view/tpl/direntry.tpl
View File

@ -1,5 +1,4 @@
<div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
<div class="generic-content-wrapper">
<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" >
<div class="contact-photo" id="directory-photo-{{$entry.id}}" >
@ -13,4 +12,3 @@
{{/if}}
<div class="contact-details">{{$entry.details}}</div>
</div>
</div>

4
view/tpl/event_form.tpl
View File

@ -1,3 +1,5 @@
<div class="generic-content-wrapper">
<h3>{{$title}}</h3>
<p>
@ -147,4 +149,4 @@
});
});
</script>
</div>

2
view/tpl/events-js.tpl
View File

@ -1,6 +1,8 @@
{{$tabs}}
<div class="generic-content-wrapper">
<h2>{{$title}}</h2>
<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
<div id="events-calendar"></div>
</div>

5
view/tpl/menulist.tpl
View File

@ -1,3 +1,5 @@
<div class="generic-content-wrapper">
<h1>{{$title}}</h1>
<a href="menu/new" title="{{$hintnew}}">{{$hintnew}}</a>
@ -12,5 +14,4 @@
</ul>
{{/if}}
</div>

4
view/tpl/notifications.tpl
View File

@ -1,7 +1,11 @@
<div class="generic-content-wrapper">
<h1>{{$notif_header}}</h1>
{{if $notifications_available}}
<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
{{/if}}
<div class="notif-network-wrapper">
{{$notif_content}}
</div>
</div>

2
view/tpl/photo_album.tpl
View File

@ -12,7 +12,7 @@
<div class="clear"></div>
</div>
<div id="photo-album-contents">
<div id="photo-album-contents" class="generic-content-wrapper">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}

3
view/tpl/photo_view.tpl
View File

@ -1,4 +1,5 @@
<div id="live-photos"></div>
<div class="generic-content-wrapper">
<h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
<div id="photo-edit-link-wrap">
@ -97,5 +98,7 @@
<div class="clear"></div>
</div>
{{$paginate}}

2
view/tpl/photos_recent.tpl
View File

@ -5,7 +5,7 @@
<h2>{{$title}}</h2>
<div class="clear"></div>
</div>
<div id="photo-album-contents">
<div id="photo-album-contents" class="generic-content-wrapper">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}

2
view/tpl/photos_upload.tpl
View File

@ -4,7 +4,7 @@
<div class="clear"></div>
</div>
<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="generic-content-wrapper">
<input type="hidden" id="photos-upload-source" name="source" value="photos" />
<div id="photos-upload-new-wrapper" >
<div id="photos-upload-newalbum-div">

1
view/tpl/profile_entry.tpl
View File

@ -7,4 +7,3 @@
<div class="profile-listing-visible">{{$visible}}</div>
</div>
<div class="profile-listing-end"></div>

3
view/tpl/profile_listing_header.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<h1>{{$header}}</h1>
<p id="profile-listing-desc" class="btn btn-default" >
<a href="profile_photo" >{{$chg_photo}}</a>
@ -7,5 +8,3 @@
</p>
<p id="profile-listing-new-link-wrapper" class="btn btn-default" >
<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
</div>

2
view/tpl/webpagelist.tpl
View File

@ -1,6 +1,6 @@
{{if $pages}}
<div id="pagelist-content-wrapper" class="generic-content-wrapper">
<div id="pagelist-content-wrapper">
<table class="webpage-list-table">
<tr><td>{{$actions_txt}}</td><td>{{$pagelink_txt}}</td><td>{{$title_txt}}</td><td>{{$created_txt}}</td><td>{{$edited_txt}}</td></tr>
{{foreach $pages as $key => $items}}