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

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-06-03 16:30:16 -07:00
commit c796f2ac95
4 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1663,7 +1663,6 @@ border: 1px #111;
iframe#profile-jot-text_ifr { iframe#profile-jot-text_ifr {
width: 100% !important; width: 100% !important;
height: 100% !important;
box-shadow: 5px 5px 5px #000 inset !important;} box-shadow: 5px 5px 5px #000 inset !important;}
tr.mceLast { tr.mceLast {
@ -3770,3 +3769,41 @@ ul.menu-popup {
.reshared-content { margin-left: 30px; } .reshared-content { margin-left: 30px; }
.shared_header img { margin-right: 10px; } .shared_header img { margin-right: 10px; }
.mail-list-wrapper {
border-bottom: 1px solid #ccc;
padding: 20px;
}
span.mail-delete {
float: left;
width: 30px;
}
a.mail-list-sender-url {
float: left;
width: 35px;
}
img.mail-list-sender-photo {
height: 16px;
width: 16px;
}
span.mail-from {
float: left;
width: 200px;
}
span.mail-subject.unseen{
float: left;
width: 200px;
}
span.mail-date {
float:left;
width: 200px;
}

2
view/tpl/mail_list.tpl
View File

@ -4,9 +4,9 @@
* *
*}} *}}
<div class="mail-list-wrapper"> <div class="mail-list-wrapper">
<span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span>
<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> <a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
<span class="mail-from">{{$from_name}}</span> <span class="mail-from">{{$from_name}}</span>
<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span> <span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
<span class="mail-date" title="{{$date}}">{{$date}}</span> <span class="mail-date" title="{{$date}}">{{$date}}</span>
<span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span>
</div> </div>

2
view/tpl/nav.tpl
View File

@ -11,7 +11,7 @@
<ul> <ul>
{{if $userinfo}} {{if $userinfo}}
<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a> <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">&nabla;</a>
{{if $localuser}} {{if $localuser}}
<ul id="nav-user-menu" class="menu-popup"> <ul id="nav-user-menu" class="menu-popup">
{{foreach $nav.usermenu as $usermenu}} {{foreach $nav.usermenu as $usermenu}}

15
view/tpl/opensearch.tpl
View File

@ -1,15 +1,10 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
<ShortName>Friendika@{{$nodename}}</ShortName> <ShortName>Red Matrix@{{$nodename}}</ShortName>
<Description>Search in Friendika@{{$nodename}}</Description> <Description>Search in The Red Matrix@{{$nodename}}</Description>
<Contact>http://bugs.friendika.com/</Contact> <Contact>http://github.com/friendica/red/</Contact>
<Image height="16" width="16" type="image/png">{{$baseurl}}/images/friendika-16.png</Image> <Image height="16" width="16" type="image/png">{{$baseurl}}/images/rhash-16.png</Image>
<Image height="64" width="64" type="image/png">{{$baseurl}}/images/friendika-64.png</Image> <Image height="64" width="64" type="image/png">{{$baseurl}}/images/rhash-64.png</Image>
<Url type="text/html" <Url type="text/html"
template="{{$baseurl}}/search?search={searchTerms}"/> template="{{$baseurl}}/search?search={searchTerms}"/>
<Url type="application/opensearchdescription+xml" <Url type="application/opensearchdescription+xml"