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-09-27 00:15:43 -07:00
commit 51c0904a8a
9 changed files with 89 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/language.php
View File

@ -146,7 +146,7 @@ function load_translation_table($lang, $install = false) {
*
* @param $s string that should get translated
* @param $ctx optional context to appear in po file
* @return translated string if exsists, otherwise s
* @return translated string if exists, otherwise return $s
*
*/
function t($s,$ctx = '') {

21
mod/photos.php
View File

@ -652,9 +652,10 @@ function photos_content(&$a) {
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
$o .= '<h3>' . $album . '</h3>';
$o .= '<div class="section-title-wrapper">';
$o .= '<h3>' . $album . '</h3>';
$o .= '<div class="section-title-submenu">';
if($cmd === 'edit') {
if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
if($can_post) {
@ -680,22 +681,24 @@ function photos_content(&$a) {
else {
if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
if($can_post) {
$o .= '<div id="album-edit-link"><a href="'. $a->get_baseurl() . '/photos/'
. $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">'
. t('Edit Album') . '</a></div>';
$o .= '<a href="'. $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit' . '">' . t('Edit Album') . '</a>';
}
}
}
if($_GET['order'] === 'posted')
$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '" >' . t('Show Newest First') . '</a></div>';
$o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '" >' . t('Show Newest First') . '</a>';
else
$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted" >' . t('Show Oldest First') . '</a></div>';
$o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted" >' . t('Show Oldest First') . '</a>';
/*
if($can_post) {
$o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</a></div>';
$o .= '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</<a>';
}
*/
$o .= '</div>'; // section-title-submenu
$o .= '</div>'; // section-title-wrapper
$ajaxout = '';

34
view/css/bootstrap-red.css vendored
View File

@ -1,37 +1,15 @@
/* override some bootstrap settings */
html {
font-size: 100%;
h1, h2 {
font-size: 1.583em;
}
h1,
.h1 {
font-size: 24px;
h3, h4 {
font-size: 1.334em;
}
h2,
.h2 {
font-size: 18px;
}
h3,
.h3 {
font-size: 16px;
}
h4,
.h4 {
font-size: 14px;
}
h5,
.h5 {
font-size: 12px;
}
h6,
.h6 {
font-size: 10px;
h5, h6 {
font-size: 0.75rem;
}
/* nav overrides */

12
view/css/conversation.css
View File

@ -107,6 +107,18 @@
overflow: auto;
}
.wall-item-content h1, .wall-item-content h2 {
font-size: 1.319em;
}
.wall-item-title {
font-size: $font_size;
}
.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 {
font-size: 1.112em;
}
.wall-item-content img {
max-width: 95%;
}

2
view/css/widgets.css
View File

@ -2,6 +2,7 @@
/* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */
.widget {
word-wrap: break-word;
margin-bottom: 10px;
padding: 10px 10px 10px 20px;
}
@ -9,7 +10,6 @@
.widget h3 {
margin-left: -10px;
margin-top: 0px;
margin-bottom: 10px;
}
/* suggest */

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

@ -9,6 +9,7 @@
/* generals */
html {
height: 100%;
font-size: 100%;
}
body {
@ -114,13 +115,7 @@ pre {
border:1px solid $pre_borderc;
}
blockquote {
background-color: $blockquote_bgcolour;
border-left: 4px solid $blockquote_bordercolour;
padding: 0.4em;
color: $blockquote_colour;
margin-left: 20px;
}
.ccollapse-wrapper {
border: 1px solid #CCC;
@ -2206,10 +2201,6 @@ nav ul li {
max-height: 50px
}
nav .badge {
border-radius: $radiuspx;
}
nav .dropdown-menu {
font-size: $body_font_size;
border-top-right-radius: 0px;
@ -2251,32 +2242,20 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
}
/* bootstrap overrides */
blockquote {
font-size: 1em;
font-size: $font_size;
font-style: italic;
background-color: $blockquote_bgcolour;
border-left: 3px solid $blockquote_bordercolour;
padding: 0.4em;
color: $blockquote_colour;
margin: 0px 0px 0px 20px;
}
h1, h2 {
font-size: 1.583em;
}
h3, h4 {
font-size: 1.334em;
}
h5, h6 {
font-size: 0.75rem;
}
.wall-item-content h1, .wall-item-content h2 {
font-size: 1.319em;
}
.wall-item-title {
font-size: $font_size;
}
.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 {
font-size: 1.112em;
.badge {
border-radius: $radiuspx;
}
.dropdown-menu {
@ -2448,6 +2427,26 @@ h5, h6 {
background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
}
.section-title-wrapper {
padding: 7px 10px;
background-color: $item_colour;
border-radius: $radiuspx;
margin-bottom: 10px;
}
.section-title-wrapper h3 {
margin-top: 0px;
margin-bottom: 0px;
}
.section-title-submenu {
margin-top: 10px;
}
.section-title-submenu a {
margin-right: 10px;
}
@media screen and (max-width: 767px) {
aside#region_1 {
background: rgba(0, 0, 0, .1);

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

@ -142,11 +142,11 @@ if(! $a->install) {
if (! $widget_brdrcolour)
$widget_brdrcolour = "rgba(238,238,238,0.8)";
if (! $blockquote_colour)
$blockquote_colour = "#000";
$blockquote_colour = "#4d4d4d";
if (! $blockquote_bgcolour)
$blockquote_bgcolour = "#f4f8f9";
$blockquote_bgcolour = "";
if (! $blockquote_bordercolour)
$blockquote_bordercolour = "#dae4ee";
$blockquote_bordercolour = "#ccc";
if (! $code_borderc)
$code_borderc = "#444";
if (! $code_bgcolour)

27
view/tpl/photo_albums.tpl
View File

@ -1,15 +1,16 @@
<div id="side-bar-photos-albums" class="widget">
<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
{{if $albums}}
<ul>
{{foreach $albums as $al}}
{{if $al.text}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a> ({{$al.total}})</li>
{{/if}}
{{/foreach}}
</ul>
{{/if}}
{{if $upload}}
<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div>
{{/if}}
<h3>{{$title}}</h3>
<ul class="nav nav-pills nav-stacked">
{{if $upload}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
{{/if}}
{{if $albums}}
{{foreach $albums as $al}}
{{if $al.text}}
<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li>
{{/if}}
{{/foreach}}
{{/if}}
</ul>
</div>

16
view/tpl/photos_recent.tpl
View File

@ -1,13 +1,11 @@
<h3>{{$title}}</h3>
{{if $can_post}}
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
{{/if}}
<div class="section-title-wrapper">
<h3>{{$title}}</h3>
</div>
<div id="photo-album-contents">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}
<div id="page-end"></div>
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}
<div id="page-end"></div>
</div>
<div class="photos-end"></div>
<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>