Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list.

This commit is contained in:
Thomas Willingham 2012-11-26 02:11:19 +00:00
parent 54bcfd2535
commit b0b4baa331
29 changed files with 110 additions and 57666 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 459 B

File diff suppressed because it is too large Load diff

View file

@ -394,14 +394,7 @@
}
/* global */
body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 12.5px;
background-color: #ffffff;
color: #2d2d2d;
margin: 50px auto auto;
display: table;
}
h4 {
font-size: 1.1em;
@ -1157,12 +1150,6 @@ span.sbox input {
top: 18px;
}
/* section */
section {
display: table-cell;
vertical-align: top;
width: auto;
padding: 0px 0px 0px 12px;
}
body .pageheader{
text-align: center;
@ -1258,14 +1245,7 @@ transition: all 0.2s ease-in-out;
/* wall item */
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
position: relative;
padding: 5px;
margin-bottom: 0px;
width: 575px;
padding-top: 10px;
}
.wall-item-decor {
position: absolute;
left: 790px;

File diff suppressed because it is too large Load diff

View file

@ -398,7 +398,7 @@ body {
font-size: 12.5px;
background-color: #ffffff;
color: #2d2d2d;
margin: 50px auto auto;
margin: 50px 8%;
display: table;
}
@ -1136,8 +1136,8 @@ span.sbox input {
section {
display: table-cell;
vertical-align: top;
width: 610px;
padding: 0px 0px 0px 12px;
width: 90%;
padding: 20px;
}
body .pageheader{
@ -1233,6 +1233,8 @@ right_aside .icon {width: 10px; height: 10px;}
transition: all 0.2s ease-in-out;
}
/* wall item */
/*
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
position: relative;
@ -1240,7 +1242,8 @@ transition: all 0.2s ease-in-out;
margin-bottom: 0px;
width: 575px;
padding-top: 10px;
}
}*/
.wall-item-decor {
position: absolute;
left: 790px;

File diff suppressed because it is too large Load diff

View file

@ -238,6 +238,7 @@
width: 20px;
height: 20px;
/*background-image: url('icons.png');*/
float: left;
}
.icon {
@ -434,7 +435,7 @@ body {
font-size: 12.5px;
background-color: #ffffff;
color: #2d2d2d;
margin: 50px auto auto;
margin: 50px 2%;
display: table;
}
@ -1319,8 +1320,8 @@ transition: all 0.2s ease-in-out;
section {
display: table-cell;
vertical-align: top;
width: 800px;
padding: 0px 0px 0px 12px;
/* width: 90%; */
/* padding: 20px;*/
}
body .pageheader{
@ -1378,7 +1379,8 @@ body .pageheader{
position: relative;
padding: 5px;
margin-bottom: 0px;
width: 775px;
margin-left: 15px;
/* width: 775px; */
padding-top: 10px;
}
@ -1419,11 +1421,14 @@ body .pageheader{
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out; */
}
.wall-item-container .wall-item-info {
.wall-item-container,
.wall-item-info {
display: table-cell;
vertical-align: top;
text-align: left;
width: 80px;
width: 110px;
float: left;
margin: 10px;
}
.wall-item-photo-container .wall-item-info {
display: table-cell;
@ -1431,6 +1436,40 @@ body .pageheader{
text-align: left;
width: 80px;
}
.wall-item-photo-menu-button {
display: block;
position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
height: 16px;
top: 74px; left:10px;
overflow: hidden;
text-indent: 40px;
display: none;
}
.wall-item-photo-menu {
width: auto;
border: 2px solid #444444;
background: #FFFFFF;
position: absolute;
left: 10px; top: 90px;
display: none;
z-index: 10000;
}
.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
.wall-item-photo-menu li a { display: block; padding: 2px; }
.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
.comment .wall-item-photo-menu-button { top: 44px;}
.comment .wall-item-photo-menu { top: 60px; }
.wall-item-container .wall-item-location {
padding-right: 40px;
display: table-cell;
@ -1439,6 +1478,28 @@ body .pageheader{
padding-right: 40px;
display: table-cell;
}
.wall-item-tools {
clear: both;
background-image: url("head.jpg");
background-position: 0 -20px;
background-repeat: repeat-x;
padding: 5px 25% 0px;
}
.wall-item-like-buttons {
float: left;
margin-right: 10px;
/* padding-right: 10px; */
/* border-right: 2px solid #fff; */
}
.wall-item-lock {
position: absolute;
top: 5px;
left: 105px;
}
.wall-item-container .wall-item-ago {
word-wrap: break-word;
width: 50px;
@ -1459,6 +1520,15 @@ body .pageheader{
margin-bottom: 5px;
}
.wall-item-content-wrapper {
margin-top: 10px;
border: 1px solid #CCC;
position: relative;
-moz-border-radius: 3px;
border-radius: 3px;
}
.wall-item-container .wall-item-content {
max-width: 720px;

View file

@ -166,8 +166,8 @@
}
if($resolution == "wide") {
if (file_exists("$THEMEPATH/style-wide.css")){
echo file_get_contents("$THEMEPATH/style-wide.css");
if (file_exists("$THEMEPATH/style.css")){
echo file_get_contents("$THEMEPATH/style.css");
}
if($diabook_font_size == "16"){
echo "
@ -445,8 +445,8 @@
}
if($resolution == "wide") {
if (file_exists("$THEMEPATH/diabook-aerith/style-wide.css")){
echo file_get_contents("$THEMEPATH/diabook-aerith/style-wide.css");
if (file_exists("$THEMEPATH/diabook-aerith/style.css")){
echo file_get_contents("$THEMEPATH/diabook-aerith/style.css");
}
if($diabook_font_size == "16"){
echo "
@ -723,8 +723,8 @@
}
if($resolution == "wide") {
if (file_exists("$THEMEPATH/diabook-blue/style-wide.css")){
echo file_get_contents("$THEMEPATH/diabook-blue/style-wide.css");
if (file_exists("$THEMEPATH/diabook-blue/style.css")){
echo file_get_contents("$THEMEPATH/diabook-blue/style.css");
}
if($diabook_font_size == "16"){
echo "
@ -1001,8 +1001,8 @@
}
if($resolution == "wide") {
if (file_exists("$THEMEPATH/diabook-red/style-wide.css")){
echo file_get_contents("$THEMEPATH/diabook-red/style-wide.css");
if (file_exists("$THEMEPATH/diabook-red/style.css")){
echo file_get_contents("$THEMEPATH/diabook-red/style.css");
}
if($diabook_font_size == "16"){
echo "
@ -1279,8 +1279,8 @@
}
if($resolution == "wide") {
if (file_exists("$THEMEPATH/diabook-pink/style-wide.css")){
echo file_get_contents("$THEMEPATH/diabook-pink/style-wide.css");
if (file_exists("$THEMEPATH/diabook-pink/style.css")){
echo file_get_contents("$THEMEPATH/diabook-pink/style.css");
}
if($diabook_font_size == "16"){
echo "
@ -1557,8 +1557,8 @@
}
if($resolution == "wide") {
if (file_exists("$THEMEPATH/diabook-green/style-wide.css")){
echo file_get_contents("$THEMEPATH/diabook-green/style-wide.css");
if (file_exists("$THEMEPATH/diabook-green/style.css")){
echo file_get_contents("$THEMEPATH/diabook-green/style.css");
}
if($diabook_font_size == "16"){
echo "
@ -1835,8 +1835,8 @@
}
if($resolution == "wide") {
if (file_exists("$THEMEPATH/diabook-dark/style-wide.css")){
echo file_get_contents("$THEMEPATH/diabook-dark/style-wide.css");
if (file_exists("$THEMEPATH/diabook-dark/style.css")){
echo file_get_contents("$THEMEPATH/diabook-dark/style.css");
}
if($diabook_font_size == "16"){
echo "

View file

@ -37,7 +37,6 @@ load_config("diabook");
load_pconfig(local_user(), "diabook");
//get statuses of boxes at right-hand-column
$close_pages = get_diabook_config( "close_pages", 0 );
$close_profiles = get_diabook_config( "close_profiles", 0 );
$close_helpers = get_diabook_config( "close_helpers", 0 );
$close_services = get_diabook_config( "close_services", 0 );
@ -109,8 +108,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
diabook_community_info();
// CUSTOM CSS
// Makes no difference now - but we'll keep this here in case I fucked up.
if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";}
if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network.css";}
}
}
@ -124,7 +124,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
// CUSTOM CSS
if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";}
if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile.css";}
}
}
@ -302,11 +302,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
document.getElementById( "close_mapquery" ).style.display = "none";
};
if('.$close_pages.')
{
document.getElementById( "close_pages" ).style.display = "none";
};
if('.$close_profiles.')
{
document.getElementById( "close_profiles" ).style.display = "none";
@ -368,7 +363,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
function diabook_community_info() {
$a = get_app();
$close_pages = get_diabook_config( "close_pages", 0 );
$close_profiles = get_diabook_config( "close_profiles", 0 );
$close_helpers = get_diabook_config( "close_helpers", 0 );
$close_services = get_diabook_config( "close_services", 0 );
@ -379,43 +373,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$close_twitter = get_diabook_config( "close_twitter", 1 );
$close_mapquery = get_diabook_config( "close_mapquery", 1 );
//Community_Pages at right_aside
if($close_pages != "1") {
if(local_user()) {
$page = '
<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decorat
ion:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
$pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid'])
);
$pageD = array();
// Look if the profile is a community page
foreach($contacts as $contact) {
$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
};
$contacts = $pageD;
foreach($contacts as $contact) {
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
$contact["name"]."</a></li>";
}
$page .= '</ul></div>';
//if (sizeof($contacts) > 0)
$aside['$page'] = $page;
}
}
//END Community Page
// comunity_profiles
if($close_profiles != "1") {
$aside['$comunity_profiles_title'] = t('Community Profiles');
@ -619,7 +576,6 @@ ion:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
}
//end twitter
if($ccCookie != "10") {
$close_pages = get_diabook_config( "close_pages", 0 );
$close_profiles = get_diabook_config( "close_profiles", 0 );
$close_helpers = get_diabook_config( "close_helpers", 0 );
$close_services = get_diabook_config( "close_services", 0 );
@ -632,7 +588,6 @@ ion:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
$close_or_not = array('1'=>t("don't show"), '0'=>t("show"),);
$boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", "");
$aside['$boxsettings'] = $boxsettings;
$aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_or_not);
$aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_or_not);
$aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_or_not);
$aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_or_not);
@ -646,7 +601,6 @@ ion:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
$baseurl = $a->get_baseurl($ssl_state);
$aside['$baseurl'] = $baseurl;
if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){
set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']);
set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']);
set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']);
set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']);

8
view/theme/diabook/todo Normal file
View file

@ -0,0 +1,8 @@
- Wall item tools in slightly the wrong place.
- Such and suck likes this in slightly the wrong place.
- Need to remove about 2 pixels from somewhere for 1024 resolution
- Quick and dirty hack to make people with wide already configured use the normal CSS needs to be done properly.
- Community profiles needs to be removed/pluginised or improved. Most profiles are from Facebook. That's unsupported.
- Earth layers needs to be pluginised.
- Twatter needs to be pluginised.
- There's still a LOT of CSS clean up to be done

View file

@ -1,189 +0,0 @@
{{if $mode == display}}
{{ else }}
{{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer">
<span id="hide-comments-total-$item.id"
class="hide-comments-total">$item.num_comments</span>
<span id="hide-comments-$item.id"
class="hide-comments fakelink"
onclick="showHideComments($item.id);">$item.hide_text</span>
{{ if $item.thread_level==3 }} -
<span id="hide-thread-$item-id"
class="fakelink"
onclick="showThread($item.id);">expand</span> /
<span id="hide-thread-$item-id"
class="fakelink"
onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
</div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}}
{{ endif }}
{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
<div class="wall-item-decor">
<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
<div class="wall-item-container $item.indent $item.shiny" id="item-$item.id">
<div class="wall-item-item">
<div class="wall-item-info">
<div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
</a>
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
{{ if $item.owner_url }}
<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
</a>
</div>
{{ endif }}
</div>
<div class="wall-item-location">$item.location</div>
</div>
<div class="wall-item-actions-author">
<a href="$item.profile_url" target="redir"
title="$item.linktitle"
class="wall-item-name-link"><span
class="wall-item-name$item.sparkle">$item.name</span></a>
<span class="wall-item-ago" title="$item.localtime">$item.ago</span>
{{ if $item.owner_url }}<br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
{{ endif }}
</div>
<div class="wall-item-content">
{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
$item.body
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.hashtags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
{{ for $item.mentions as $tag }}
<span class='mention'>$tag</span>
{{ endfor }}
{{ for $item.folders as $cat }}
<span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
{{ endfor }}
{{ for $item.categories as $cat }}
<span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
{{ endfor }}
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-links">
{{ if $item.plink }}<a class="icon s16 link$item.sparkle" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
</div>
<div class="wall-item-actions">
<div class="wall-item-actions">
<div class="wall-item-actions-social">
{{ if $item.vote }}
<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
{{ if $item.vote.dislike }}
<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
{{ endif }}
{{ endif }}
{{ if $item.vote.share }}
<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
{{ endif }}
{{ if $item.star }}
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
{{ endif }}
{{ if $item.tagger }}
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
{{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
</div>
<div class="wall-item-actions-tools">
{{ if $item.drop.pagedrop }}
<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
{{ endif }}
{{ if $item.drop.dropping }}
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
{{ endif }}
{{ if $item.edpost }}
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
<div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-links"></div>
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div>
{{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent $item.shiny==comment }}
<div class="wall-item-bottom">
<div class="wall-item-links"></div>
<div class="wall-item-comment-wrapper">
$item.comment
</div>
</div>
{{ endif }}{{ endif }}{{ endif }}
</div>
{{ for $item.children as $child }}
{{ if $item.type == tag }}
{{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
{{ else }}
{{ inc $item.template with $item=$child }}{{ endinc }}
{{ endif }}
{{ endfor }}
{{ if $item.thread_level!=1 }}</div>{{ endif }}
{{if $mode == display}}
{{ else }}
{{if $item.comment_lastcollapsed}}</div>{{endif}}
{{ endif }}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper" >$item.comment</div>
{{ endif }}{{ endif }}{{ endif }}
{{ if $item.flatten }}
<div class="wall-item-comment-wrapper" >$item.comment</div>
{{ endif }}