keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse source
This commit is contained in:
Tobias Diekershoff 2012-03-26 14:49:15 +02:00
commit f1d15d8884
13 changed files with 29 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
view/theme/darkzero-NS/screenshot.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 82 KiB

17
view/theme/diabook-blue/communityhome.tpl
View file

@ -1,3 +1,7 @@
{{ if $page }}
<div>$page</div>
{{ endif }}
{{ if $lastusers_title }} {{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?</h3> <h3 style="margin-top:0px;">Help or @NewHere ?</h3>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
@ -6,6 +10,11 @@
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a> <a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
{{ endif }} {{ endif }}
{{ if $lastusers_title }}
<h3>PostIt to Friendica</h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
{{ endif }}
{{ if $lastusers_title }} {{ if $lastusers_title }}
<h3>Connectable Services</h3> <h3>Connectable Services</h3>
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;"> <div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
@ -47,14 +56,6 @@
</div> </div>
{{ endif }} {{ endif }}
{{ if $page }}
<div>$page</div>
{{ endif }}
{{ if $lastusers_title }}
<h3>PostIt to Friendica</h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
{{ endif }}
{{ if $like_title }} {{ if $like_title }}
<h3>$like_title</h3> <h3>$like_title</h3>

2
view/theme/diabook-blue/photo_view.tpl
View file

@ -12,7 +12,7 @@
<div id="photo-photo"> <div id="photo-photo">
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
<a href="$photo.href" class="fancy-photo" title="$photo.title"><img src="$photo.src" /></a> <a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
</div> </div>

4
view/theme/diabook-blue/style-network.css
View file

@ -1189,7 +1189,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 30px;} #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;} #page-sidebar-right_aside ul {margin-top: 0px;}
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {
@ -1271,7 +1271,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {
max-width: 500px; max-width: 400px;
} }
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell; display: table-cell;

4
view/theme/diabook-blue/style-profile.css
View file

@ -1189,7 +1189,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 30px;} #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;} #page-sidebar-right_aside ul {margin-top: 0px;}
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {
@ -1271,7 +1271,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {
max-width: 500px; max-width: 400px;
} }
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell; display: table-cell;

4
view/theme/diabook-blue/style.css
View file

@ -178,8 +178,8 @@
.icon.on { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;} .icon.on { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
.icon.off { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;} .icon.off { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
.prev { background-position: -90px -60px;} .icon.prev { background-image: url("../../../view/theme/diabook-blue/icons/prev.png"); background-repeat: no-repeat;}
.next { background-position: -110px -60px;} .icon.next { background-image: url("../../../view/theme/diabook-blue/icons/next.png"); background-repeat: no-repeat;}
/*.tagged { background-position: -130px -60px;}*/ /*.tagged { background-position: -130px -60px;}*/
.attachtype { .attachtype {

3
view/theme/diabook-blue/theme.php
View file

@ -7,9 +7,6 @@
* Author: * Author:
*/ */
$a->theme_info = array(
'extends' => 'diabook',
);
//change css on network and profilepages //change css on network and profilepages
$cssFile = null; $cssFile = null;

1
view/theme/diabook-blue/wall_item.tpl
View file

@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }} {{ if $item.indent }}{{ else }}
<div class="wall-item-decor"> <div class="wall-item-decor">
{{ if $item.lock }}<span class="icon 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;" /> <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div> </div>
{{ endif }} {{ endif }}

1
view/theme/diabook-blue/wallwall_item.tpl
View file

@ -1,6 +1,5 @@
{{ if $item.indent }}{{ else }} {{ if $item.indent }}{{ else }}
<div class="wall-item-decor"> <div class="wall-item-decor">
{{ if $item.lock }}<span class="icon 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;" /> <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div> </div>
{{ endif }} {{ endif }}

18
view/theme/diabook/communityhome.tpl
View file

@ -1,3 +1,7 @@
{{ if $page }}
<div>$page</div>
{{ endif }}
{{ if $lastusers_title }} {{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or @NewHere ?</h3> <h3 style="margin-top:0px;">Help or @NewHere ?</h3>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
@ -20,6 +24,11 @@
</div> </div>
{{ endif }} {{ endif }}
{{ if $lastusers_title }}
<h3>PostIt to Friendica</h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
{{ endif }}
{{ if $lastusers_title }} {{ if $lastusers_title }}
<h3>$lastusers_title</h3> <h3>$lastusers_title</h3>
<div id='lastusers-wrapper' class='items-wrapper'> <div id='lastusers-wrapper' class='items-wrapper'>
@ -47,15 +56,6 @@
</div> </div>
{{ endif }} {{ endif }}
{{ if $page }}
<div>$page</div>
{{ endif }}
{{ if $lastusers_title }}
<h3>PostIt to Friendica</h3>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
{{ endif }}
{{ if $like_title }} {{ if $like_title }}
<h3>$like_title</h3> <h3>$like_title</h3>
<ul id='likes'> <ul id='likes'>

4
view/theme/diabook/style-network.css
View file

@ -1168,7 +1168,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 30px;} #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;} #page-sidebar-right_aside ul {margin-top: 0px;}
.icon.expand { .icon.expand {
background-image: url("../../../view/theme/diabook/icons/expand.png"); background-image: url("../../../view/theme/diabook/icons/expand.png");
@ -1252,7 +1252,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {
max-width: 500px; max-width: 400px;
} }
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell; display: table-cell;

4
view/theme/diabook/style-profile.css
View file

@ -1166,7 +1166,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 30px;} #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;} #page-sidebar-right_aside ul {margin-top: 0px;}
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {
@ -1244,7 +1244,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {
max-width: 500px; max-width: 400px;
} }
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell; display: table-cell;

3
view/theme/diabook/theme.php
View file

@ -7,9 +7,6 @@
* Author: * Author:
*/ */
$a->theme_info = array(
//'extends' => 'diabook', //it's diabook, don't need to extend himself...
);
//change css on network and profilepages //change css on network and profilepages
$cssFile = null; $cssFile = null;