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-08-24 16:53:10 -07:00
commit 22746dd14c
8 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,6 +331,8 @@ ul.tabs {
/* footer */ /* footer */
footer { footer {
position:fixed;
bottom:1px;
text-align: right; text-align: right;
padding-bottom: 1em; padding-bottom: 1em;
padding-right: 3em; padding-right: 3em;

23
view/tpl/direntry.tpl
View File

@ -1,13 +1,16 @@
<div class="directory-item lframe" id="directory-item-{{$entry.id}}" > <div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > <div class="generic-content-wrapper">
<div class="contact-photo" id="directory-photo-{{$entry.id}}" >
<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a>
</div>
</div>
<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div> <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" >
{{if $entry.connect}} <div class="contact-photo" id="directory-photo-{{$entry.id}}" >
<div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div> <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a>
{{/if}} </div>
<div class="contact-details">{{$entry.details}}</div> </div>
<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
{{if $entry.connect}}
<div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div>
{{/if}}
<div class="contact-details">{{$entry.details}}</div>
</div>
</div> </div>

2
view/tpl/mail_display.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
{{foreach $mails as $mail}} {{foreach $mails as $mail}}
{{include file="mail_conv.tpl"}} {{include file="mail_conv.tpl"}}
{{/foreach}} {{/foreach}}
@ -7,3 +8,4 @@
{{else}} {{else}}
{{$unknown_text}} {{$unknown_text}}
{{/if}} {{/if}}
</div>

2
view/tpl/mail_list.tpl
View File

@ -1,4 +1,4 @@
<div class="mail-list-wrapper"> <div class="generic-content-wrapper" id="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> <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>

2
view/tpl/page_display.tpl
View File

@ -1,6 +1,6 @@
<div class="page"> <div class="page">
<div class="page-content-wrapper" id="page-content-wrapper" > <div class="generic-content-wrapper" id="page-content-wrapper" >
<h3 class="page-title">{{$title}}</h3> <h3 class="page-title">{{$title}}</h3>
<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
<div class="page-date">{{$date}}</div> <div class="page-date">{{$date}}</div>

3
view/tpl/profile_advanced.tpl
View File

@ -1,3 +1,4 @@
<div id="profile-content-wrapper" class="generic-content-wrapper">
<h2>{{$title}}</h2> <h2>{{$title}}</h2>
<dl id="aprofile-fullname" class="aprofile"> <dl id="aprofile-fullname" class="aprofile">
@ -179,4 +180,4 @@
{{/foreach}} {{/foreach}}
{{/if}} {{/if}}
</div>

2
view/tpl/sellpage_view.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<h1>{{$header}}</h1> <h1>{{$header}}</h1>
<div class="descriptive-text">{{$desc}}</div> <div class="descriptive-text">{{$desc}}</div>
@ -7,3 +8,4 @@
<div class="sellpage-final">{{$desc2}}</div> <div class="sellpage-final">{{$desc2}}</div>
{{$submit}} {{$submit}}
</div>

2
view/tpl/webpagelist.tpl
View File

@ -2,7 +2,7 @@
{{if $pages}} {{if $pages}}
<div id="pagelist-content-wrapper"> <div id="pagelist-content-wrapper" class="generic-content-wrapper">
{{foreach $pages as $key => $items}} {{foreach $pages as $key => $items}}
{{foreach $items as $item}} {{foreach $items as $item}}
<div class="page-list-item"> <div class="page-list-item">