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

This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme.

Browse Source 
adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet.
Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
This commit is contained in:
marijus 2014-10-10 15:52:56 +02:00
parent 053e606108
commit 4e9bd8b8f0
18 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/bookmarks.php
View File

@ -55,7 +55,7 @@ function bookmarks_content(&$a) {
$o = profile_tabs($a,true,$channel['channel_address']); $o = profile_tabs($a,true,$channel['channel_address']);
$o .= '<div class="generic-content-wrapper">'; $o .= '<div class="generic-content-wrapper-styled">';
$o .= '<h3>' . t('My Bookmarks') . '</h3>'; $o .= '<h3>' . t('My Bookmarks') . '</h3>';

2
mod/profiles.php
View File

@ -767,8 +767,6 @@ logger('extra_fields: ' . print_r($extra_fields,true));
)); ));
} }
$o .= '</div>';
} }
return $o; return $o;
} }

2
mod/webpages.php
View File

@ -81,7 +81,7 @@ function webpages_content(&$a) {
require_once('include/conversation.php'); require_once('include/conversation.php');
$o = profile_tabs($a,true); $o = profile_tabs($a,true);
$o .= '<div class="generic-content-wrapper">'; $o .= '<div class="generic-content-wrapper-styled">';
$o .= '<h2>' . t('Webpages') . '</h2>'; $o .= '<h2>' . t('Webpages') . '</h2>';

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

@ -1868,7 +1868,7 @@ img.mail-list-sender-photo {
border-top-left-radius: $radiuspx; border-top-left-radius: $radiuspx;
} }
.generic-content-wrapper { .generic-content-wrapper-styled {
background-color: $genericcontent_bgcolour; background-color: $genericcontent_bgcolour;
padding: 10px; padding: 10px;
border-radius: $radiuspx; border-radius: $radiuspx;

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

@ -24,6 +24,7 @@ if(! $a->install) {
$background_image = get_pconfig($uid, "redbasic", "background_image"); $background_image = get_pconfig($uid, "redbasic", "background_image");
$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
$genericcontent_bgcolour = get_pconfig($uid, "redbasic", "genericcontent_bgcolour");
$item_colour = get_pconfig($uid, "redbasic", "item_colour"); $item_colour = get_pconfig($uid, "redbasic", "item_colour");
$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour"); $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
@ -121,12 +122,12 @@ if(! $a->install) {
$bgcolour = "#fdfdfd"; $bgcolour = "#fdfdfd";
if (! $background_image) if (! $background_image)
$background_image =''; $background_image ='';
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour ='rgba(254,254,254,0.8)';
if (! $item_colour) if (! $item_colour)
$item_colour = "rgba(238,238,238,0.8)"; $item_colour = "rgba(238,238,238,0.8)";
if (! $comment_item_colour) if (! $comment_item_colour)
$comment_item_colour = "rgba(254,254,254,0.4)"; $comment_item_colour = "rgba(254,254,254,0.4)";
if (! $genericcontent_bgcolour)
$genericcontent_bgcolour = $comment_item_colour;
if (! $comment_border_colour) if (! $comment_border_colour)
$comment_border_colour = "rgba(238,238,238,0.8)"; $comment_border_colour = "rgba(238,238,238,0.8)";
if (! $toolicon_colour) if (! $toolicon_colour)

2
view/tpl/channels.tpl
View File

@ -1,4 +1,4 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper-styled">
<h3>{{$header}}</h3> <h3>{{$header}}</h3>
{{if $links}} {{if $links}}

2
view/tpl/cloud_actionspanel.tpl
View File

@ -1,3 +1,5 @@
<div class="generic-content-wrapper-styled">
<table> <table>
<tr> <tr>
<td><strong>{{$folder_header}}</strong>&nbsp;&nbsp;&nbsp;</td> <td><strong>{{$folder_header}}</strong>&nbsp;&nbsp;&nbsp;</td>

3
view/tpl/cloud_directory.tpl
View File

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

2
view/tpl/connections.tpl
View File

@ -1,4 +1,4 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper-styled">
<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>

2
view/tpl/directory_header.tpl
View File

@ -1,4 +1,4 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper-styled">
<h1>{{$dirlbl}}</h1> <h1>{{$dirlbl}}</h1>
{{if $search}} {{if $search}}

2
view/tpl/event_form.tpl
View File

@ -1,4 +1,4 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper-styled">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>

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

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

2
view/tpl/menulist.tpl
View File

@ -1,4 +1,4 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper-styled">
<h1>{{$title}}</h1> <h1>{{$title}}</h1>

2
view/tpl/notifications.tpl
View File

@ -1,4 +1,4 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper-styled">
<h1>{{$notif_header}}</h1> <h1>{{$notif_header}}</h1>

2
view/tpl/photo_view.tpl
View File

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

5
view/tpl/photos_upload.tpl
View File

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

2
view/tpl/profile_entry.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper-styled">
<div class="profile-listing" > <div class="profile-listing" >
<div class="profile-listing-photo-wrapper" > <div class="profile-listing-photo-wrapper" >
<a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
@ -7,3 +8,4 @@
<div class="profile-listing-visible">{{$visible}}</div> <div class="profile-listing-visible">{{$visible}}</div>
</div> </div>
<div class="profile-listing-end"></div> <div class="profile-listing-end"></div>
</div>

3
view/tpl/profile_listing_header.tpl
View File

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