clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pull'

This commit is contained in:
friendica 2012-04-01 01:03:05 -07:00
parent 5c2fdc795f 4bf2a7bf50
commit ae5e5bf1e4
6 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/api.php
View File

@ -83,7 +83,7 @@
$record = $r[0]; $record = $r[0];
} else { } else {
logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
header('WWW-Authenticate: Basic realm="Friendika"'); header('WWW-Authenticate: Basic realm="Friendica"');
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
die('This api requires login'); die('This api requires login');
} }

2
view/theme/dispy-dark/communityhome.tpl
View File

@ -37,8 +37,10 @@
</div> </div>
{{ endif }} {{ endif }}
{{ if $lastusers_title }}
<h3 id="postit-header">PostIt to Friendica</h3> <h3 id="postit-header">PostIt to Friendica</h3>
<div id="postit"> <div id="postit">
<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. <a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
</div> </div>
{{ endif }}

4
view/theme/dispy-dark/profile_vcard.tpl
View File

@ -10,9 +10,8 @@
<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a> <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
</li> </li>
{{ endfor }} {{ endfor }}
<li><a href="profile_photo" >$profile.menu.chg_photo</a></li> <li><a href="profile_photo">$profile.menu.chg_photo</a></li>
<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li> <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
</ul> </ul>
</div> </div>
{{ endif }} {{ endif }}
@ -81,4 +80,3 @@
$contact_block $contact_block

21
view/theme/dispy-dark/style.css
View File

@ -1062,6 +1062,8 @@ section {
} }
.tabs li { .tabs li {
display: inline; display: inline;
font-size: smaller;
font-weight: bold;
} }
.tab { .tab {
border: 1px solid #729fcf; border: 1px solid #729fcf;
@ -1120,6 +1122,7 @@ section {
} }
.wall-item-content { .wall-item-content {
overflow-x: auto; overflow-x: auto;
margin: 0px 15px 0px 5px;
} }
/* removing it from here, vs. putting it in .wall-item-content /* removing it from here, vs. putting it in .wall-item-content
* might break things for people. we shall see ;) */ * might break things for people. we shall see ;) */
@ -1203,6 +1206,7 @@ section {
.wall-item-body { .wall-item-body {
margin: 20px 20px 10px 0px; margin: 20px 20px 10px 0px;
text-align: left; text-align: left;
overflow-x: auto;
} }
.wall-item-lock-wrapper { .wall-item-lock-wrapper {
float: right; float: right;
@ -2072,6 +2076,9 @@ div[id$="wrapper"] br {
float:left; float:left;
font-size:20px; font-size:20px;
} }
.event {
background: #2e2f2e;
}
.vevent { .vevent {
border:1px solid #ccc; border:1px solid #ccc;
} }
@ -2083,15 +2090,14 @@ div[id$="wrapper"] br {
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }
#new-event-link { #new-event-link {
margin-bottom: 10px; margin-bottom: 10px;
} }
.edit-event-link, .plink-event-link { .edit-event-link, .plink-event-link {
float: left; /*float: left; */
margin-top: 4px; /*margin-top: 4px; */
margin-right: 4px; /*margin-right: 4px;*/
margin-bottom: 15px; /*margin-bottom: 15px;*/
} }
.event-description:before { .event-description:before {
content: url('../../../images/calendar.png'); content: url('../../../images/calendar.png');
@ -2100,6 +2106,7 @@ div[id$="wrapper"] br {
.event-start, .event-end { .event-start, .event-end {
margin-left: 10px; margin-left: 10px;
width: 330px; width: 330px;
font-size: smaller;
} }
.event-start .dtstart, .event-end .dtend { .event-start .dtstart, .event-end .dtend {
float: right; float: right;
@ -2200,6 +2207,10 @@ div[id$="wrapper"] br {
#item-delete-selected-desc:hover { #item-delete-selected-desc:hover {
text-decoration: underline; text-decoration: underline;
} }
.fc-state-highlight {
background: #eec;
color: #2e2f2e;
}
/** /**

9
view/theme/dispy-dark/theme.php
View File

@ -113,6 +113,10 @@ EOT;
function dispydark_community_info() { function dispydark_community_info() {
$a = get_app(); $a = get_app();
$aside['$lastusers_title'] = t('Last users');
$aside['$lastusers_items'] = array();
$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
$fostitJS = "javascript: (function() { $fostitJS = "javascript: (function() {
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
@ -138,6 +142,7 @@ function dispydark_community_info() {
} }
// aside on profile page // aside on profile page
if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { //if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispydark_community_info(); dispydark_community_info();
} //}

6
view/theme/dispy/style.css
View File

@ -146,7 +146,7 @@ a:hover {
} }
.required { .required {
display: inline; display: inline;
color: #ff0; color: #f00;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
margin: 3px; margin: 3px;
@ -1062,6 +1062,8 @@ section {
} }
.tabs li { .tabs li {
display: inline; display: inline;
font-size: smaller;
font-weight: bold;
} }
.tab { .tab {
border: 1px solid #729fcf; border: 1px solid #729fcf;
@ -1120,6 +1122,7 @@ section {
} }
.wall-item-content { .wall-item-content {
overflow-x: auto; overflow-x: auto;
margin: 0px 15px 0px 5px;
} }
/* removing it from here, vs. putting it in .wall-item-content /* removing it from here, vs. putting it in .wall-item-content
* might break things for people. we shall see ;) */ * might break things for people. we shall see ;) */
@ -1203,6 +1206,7 @@ section {
.wall-item-body { .wall-item-body {
margin: 20px 20px 10px 0px; margin: 20px 20px 10px 0px;
text-align: left; text-align: left;
overflow-x: auto;
} }
.wall-item-lock-wrapper { .wall-item-lock-wrapper {
float: right; float: right;