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

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

Browse Source
This commit is contained in:
friendica 2014-08-09 15:21:37 -07:00
commit 229ffd59ac
6 changed files with 5091 additions and 5251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/mail.php
View File

@ -229,7 +229,7 @@ function mail_content(&$a) {
'$attach' => t('Attach file'),
'$insert' => t('Insert web link'),
'$wait' => t('Please wait'),
'$submit' => t('Submit'),
'$submit' => t('Send'),
'$defexpire' => '',
'$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? true : false),
'$expires' => t('Set expiration date'),

10310
util/messages.po
View File

File diff suppressed because it is too large Load Diff

10
view/css/mod_message.css
View File

@ -1,3 +1,13 @@
/* message side */
#message-check {
text-align: left;
white-space: normal;
margin-top: 48px;
margin-bottom: 15px;
}
/* message */
#mail-list-wrapper {

10
view/css/mod_profiles.css
View File

@ -13,16 +13,10 @@
}
#profile-listing-desc, #profile-stuff-link {
margin-left: 30px;
#profile-listing-desc, #profile-stuff-link, #profile-listing-new-link-wrapper {
margin: 15px 10px 15px 0;
}
#profile-listing-new-link-wrapper {
margin-left: 30px;
margin-bottom: 30px;
}
#profile-edit-links-end {
clear: both;
margin-bottom: 15px;

4
view/tpl/message_side.tpl
View File

@ -1,6 +1,6 @@
<div id="message-sidebar" class="widget">
<div id="message-check"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div>
<div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
<div id="message-check" class="btn btn-default"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div>
<div id="message-new" class="btn btn-default"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
<ul class="message-ul">
{{foreach $tabs as $t}}

6
view/tpl/profile_listing_header.tpl
View File

@ -1,11 +1,11 @@
<h1>{{$header}}</h1>
<p id="profile-listing-desc" class="button" >
<p id="profile-listing-desc" class="btn btn-default" >
<a href="profile_photo" >{{$chg_photo}}</a>
</p>
<p id="profile-stuff-link" class="button">
<p id="profile-stuff-link" class="btn btn-default">
<a href="thing" title="{{$stuff_desc}}">{{$addstuff}}</a>
</p>
<p id="profile-listing-new-link-wrapper" class="button" >
<p id="profile-listing-new-link-wrapper" class="btn btn-default" >
<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
</div>