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

Vier: Some more changes to the theme.

Browse source 
Added a switch to suppress displaying of the tags.
This commit is contained in:
Michael Vogel 2013-03-05 00:46:11 +01:00
parent 8bb6b51967
commit 86e19dda22
5 changed files with 55 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
object/Item.php
View file

@ -158,22 +158,24 @@ class Item extends BaseObject {
$hashtags = array(); $hashtags = array();
$mentions = array(); $mentions = array();
$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", if (!get_config('system','suppress_tags')) {
intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
foreach($taglist as $tag) { foreach($taglist as $tag) {
if ($tag["url"] == "") if ($tag["url"] == "")
$tag["url"] = $searchpath.strtolower($tag["term"]); $tag["url"] = $searchpath.strtolower($tag["term"]);
if ($tag["type"] == TERM_HASHTAG) { if ($tag["type"] == TERM_HASHTAG) {
$hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>"; $hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
$prefix = "#"; $prefix = "#";
} elseif ($tag["type"] == TERM_MENTION) { } elseif ($tag["type"] == TERM_MENTION) {
$mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>"; $mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
$prefix = "@"; $prefix = "@";
}
$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
} }
$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
} }
/*foreach(explode(',',$item['tag']) as $tag){ /*foreach(explode(',',$item['tag']) as $tag){

2
view/theme/vier/nav.tpl
View file

@ -35,7 +35,7 @@
</li> </li>
{{ endif }} {{ endif }}
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear" style="color: lightgray;"></span></a> <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
<ul id="nav-site-menu" class="menu-popup"> <ul id="nav-site-menu" class="menu-popup">
{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }} {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }} {{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}

2
view/theme/vier/smarty3/nav.tpl
View file

@ -40,7 +40,7 @@
</li> </li>
{{/if}} {{/if}}
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear" style="color: lightgray;"></span></a> <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
<ul id="nav-site-menu" class="menu-popup"> <ul id="nav-site-menu" class="menu-popup">
{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}} {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}} {{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}

25
view/theme/vier/style.css
View file

@ -169,9 +169,9 @@ img {
min-width: 22px; min-width: 22px;
height: 22px; height: 22px;
} }
.icon.s22.notify { /*.icon.s22.notify {
color: gray; color: gray;
} }*/
.icon.s22.text { .icon.s22.text {
padding: 10px 0px 0px 25px; padding: 10px 0px 0px 25px;
width: 230px; width: 230px;
@ -543,6 +543,10 @@ nav {
border-bottom: 5px solid #F80; */ border-bottom: 5px solid #F80; */
} }
nav .icon {
color: #ccc;
}
nav a:active, nav a:active,
nav a:visited, nav a:visited,
nav a:link, nav a:link,
@ -554,6 +558,10 @@ nav a {
padding-top: 8px; padding-top: 8px;
} }
nav a:hover .icon {
color: #fff;
}
nav a:hover { nav a:hover {
text-decoration: none; text-decoration: none;
outline: none; outline: none;
@ -628,7 +636,12 @@ nav .nav-menu {
font-size: 13px; font-size: 13px;
/* border-bottom: 3px solid #364A84; */ /* border-bottom: 3px solid #364A84; */
color: #ccc; color: #ccc;
font-weight: bold;
} }
/*nav .nav-menu.selected a {
color: white;
}*/
nav .nav-menu.selected { nav .nav-menu.selected {
border-bottom: 3px solid #9eabb0; border-bottom: 3px solid #9eabb0;
/* background-color: #364E59; */ /* background-color: #364E59; */
@ -841,7 +854,7 @@ right_aside {
/* aside */ /* aside */
aside { aside {
display: table-cell; /* display: table-cell; */
vertical-align: top; vertical-align: top;
width: 185px; width: 185px;
padding: 10px 10px 10px 20px; padding: 10px 10px 10px 20px;
@ -1186,6 +1199,7 @@ border-bottom: 1px solid #D2D2D2;
font-weight: bold; font-weight: bold;
} }
.toplevel_item:hover .wall-item-name,
.wall-item-container:hover .wall-item-name { .wall-item-container:hover .wall-item-name {
color: #36c; color: #36c;
font-weight: bold; font-weight: bold;
@ -1196,11 +1210,12 @@ border-bottom: 1px solid #D2D2D2;
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
} }
.toplevel_item .wall-item-content a, /* .wall-item-container .wall-item-content a, */
.wall-item-container .wall-item-content a,
.toplevel_item .fakelink, .toplevel_item .fakelink,
.wall-item-container .fakelink { .wall-item-container .fakelink {
color: black; color: black;
/* color: darkblue; */
/* color: #3E3E8C; */
} }
.toplevel_item:hover .fakelink, .toplevel_item:hover .fakelink,