GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-02-04 07:26:14 -05:00
commit 92c6034b25
20 changed files with 18 additions and 1445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/newnotice.php
View File

@ -195,7 +195,7 @@ class NewnoticeAction extends Action
function ajaxErrorMsg($msg)
{
common_start_html('text/xml;charset=utf-8', true);
$this->startHTML('text/xml;charset=utf-8', true);
$this->elementStart('head');
$this->element('title', null, _('Ajax Error'));
$this->elementEnd('head');

34
actions/showstream.php
View File

@ -170,26 +170,22 @@ class ShowstreamAction extends Action
function showFeeds()
{
// Feeds
$this->element('link', array('rel' => 'alternate',
'href' => common_local_url('api',
array('apiaction' => 'statuses',
'method' => 'entity_timeline.rss',
'argument' => $this->user->nickname)),
'type' => 'application/rss+xml',
'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
$this->element('link', array('rel' => 'alternate feed',
'href' => common_local_url('api',
array('apiaction' => 'statuses',
'method' => 'entity_timeline.atom',
'argument' => $this->user->nickname)),
'type' => 'application/atom+xml',
'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
$this->element('link', array('rel' => 'alternate',
'href' => common_local_url('userrss', array('nickname' =>
$this->user->nickname)),
'type' => 'application/rdf+xml',
'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
'type' => 'application/rss+xml',
'href' => common_local_url('userrss',
array('nickname' => $this->user->nickname)),
'title' => sprintf(_('Notice feed for %s (RSS)'),
$this->user->nickname)));
$this->element('link',
array('rel' => 'alternate',
'href' => common_local_url('api',
array('apiaction' => 'statuses',
'method' => 'user_timeline.atom',
'argument' => $this->user->nickname)),
'type' => 'application/atom+xml',
'title' => sprintf(_('Notice feed for %s (Atom)'),
$this->user->nickname)));
}
function extraHead()

4
lib/htmloutputter.php
View File

@ -172,7 +172,7 @@ class HTMLOutputter extends XMLOutputter
'type' => 'text',
'id' => $id);
if ($value) {
$attrs['value'] = htmlspecialchars($value);
$attrs['value'] = $value;
}
$this->element('input', $attrs);
if ($instructions) {
@ -206,7 +206,7 @@ class HTMLOutputter extends XMLOutputter
'class' => 'checkbox',
'id' => $id);
if ($value) {
$attrs['value'] = htmlspecialchars($value);
$attrs['value'] = $value;
}
if ($checked) {
$attrs['checked'] = 'checked';

BIN
theme/default/bg-body.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 154 B

BIN
theme/default/bg-header.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

1107
theme/default/display.css
View File

File diff suppressed because it is too large Load Diff

BIN
theme/default/icon_feed.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 521 B

BIN
theme/default/icon_foaf.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
theme/default/icon_heart-01.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 67 B

BIN
theme/default/icon_heart-02.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 74 B

BIN
theme/default/icon_tag-01.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 586 B

73
theme/default/ie6.css
View File

@ -1,73 +0,0 @@
@charset "UTF-8";
/* CSS Document */
body {
text-align: center;
}
input {
height: 24px;
}
#wrap {
margin: 0 auto;
padding: 0 20px;
width: 800px;
text-align: left;
background: url(bg-header.gif) repeat-x #fbf2d7;
}
#header {
position: relative;
margin-left: 108px;
}
#nav_views {
margin: 0;
}
#nav_views li {
line-height: 19px;
}
.statistics dd {
margin-top: -15px;
clear: both;
}
#notices {
margin: 0;
}
.notice_single {
height: 48px;
}
#profile {
margin-left:0px;
}
#profile p.notice_current {
height: 96px;
}
#filter_tags {
margin-left:20px;
}
#content .subscriptions {
margin-left:30px;
width:100%;
}
#subscriptions_avatars li {
float: left;
margin: 0;
padding: 0;
}
img.avatar.original, img.avatar.profile {
clear: none;
float: left;
}
#status_textarea {
height: 46px;
}
#nav_pagination li a {
padding: 6px 15px;
line-height: 27px;
}
#nav_sub {
position: relative;
margin-left: 108px;
}
#footer {
margin-left: 108px;
}

39
theme/default/ie7.css
View File

@ -1,39 +0,0 @@
@charset "UTF-8";
/* CSS Document */
input.disfavor,
input.favor {
text-indent:0;
text-align:right;
padding-left:25px;
}
#profile_actions li {
float:left;
clear:both;
}
#profile_actions #profile_nudge input.submit {
margin-left:0;
width:100px;
}
#statistics dd {
clear: both;
}
#subscriptions_avatars li {
float: left;
}
img.avatar.original, img.avatar.profile {
clear: none;
float: left;
}
#nav_pagination li a {
padding: 6px 15px;
line-height: 27px;
}
#filter_tags ul li#filter_tags_item label {
position:relative;
top:-8px;
}

BIN
theme/default/login-bg.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 328 B

BIN
theme/identica/bg-body.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 136 B

BIN
theme/identica/bg-header.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

187
theme/identica/display.css
View File

@ -1,187 +0,0 @@
/* CSS Document */
/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
@import url(../default/display.css);
html {
background: url(bg-body.gif) repeat-y top center #d8e2d7;
}
body {
color: #193441;
}
a {
color: #C15D42;
}
#wrap {
background: url(bg-header.gif) repeat-x #FCFFF5;
}
#header h1.pagetitle {
color: #d8e2d7;
}
#header h2.sitename {
color: #FCFFF5;
}
#nav li a {
color: #91AA9D;
}
#nav_views li a {
color: #FCFFF5;
background-color: #91AA9D;
border-right: 1px solid #6A8787;
}
#nav_views li.current a, #nav_views li.current a:hover {
color: #3F606F;
background-color: #FCFFF5;
border-right: 1px solid #6A8787;
}
#nav_views li.current a:hover {
color: #193441;
}
#nav_views li a:hover {
color: #FCFFF5;
background-color: #3F606F;
border-right: 1px solid #6A8787;
}
#nav_sub {
border-top: 1px solid #D8E2D7;
}
.instructions p, .success, .error {
border: 1px solid #91AA9D;
color: #FCFFF5;
}
.instructions a:hover, .success a:hover, .error a:hover {
color: #FCFFF5;
}
#notices {
border-top: 1px solid #D8E2D7;
}
.notice_single {
border-bottom: 1px solid #D8E2D7;
}
.notice_single:hover {
background-color: #F3F8EA;
}
input#submit_yes, input#submit_no {
color: #FCFFF5;
background-color: #C15D42;
}
input#submit_yes:hover, input#submit_no:hover {
background-color: #904632;
}
p.time a {
color: #91AA9D;
}
#profile {
border-top: 1px solid #D8E2D7;
}
#profile h2 {
color: #91AA9D;
}
#nav_pagination li {
background-color: #91AA9D;
}
#nav_pagination li a {
background-color: #91AA9D;
color: #FCFFF5;
}
#nav_pagination li a:hover {
color: #FCFFF5;
}
#footer {
border-top: 1px solid #D8E2D7;
}
form input {
border: 1px solid #D8E2D7;
}
input#submit, input.submit {
color: #FCFFF5;
background-color: #C15D42;
}
input#submit:hover, input.submit:hover {
background-color: #904632;
}
textarea, input {
color: #193441;
}
textarea:focus, input:focus {
background-color: #f0f6eb;
}
.input_instructions {
color: #91aa9d;
}
#status_label {
color: #91AA9D;
}
#status_textarea {
color: #193441;
}
#status_submit {
background-color: #C15D42;
color: #FCFFF5;
}
#status_submit:hover {
background-color: #904632;
}
#content .subscribe .submit, #content .unsubscribe .submit, #remotesubscribe .button, #remotesubscribe {
background-color: #c15d42;
color: #fcfff5;
}
#profiles {
border-top: 1px solid #D8E2D7;
}
.profile_single {
border-bottom: 1px solid #D8E2D7;
}
.profile_single:hover {
background-color: #F3F8EA;
}
#messages {
border-top: 1px solid #D8E2D7;
}
.message_single {
border-bottom: 1px solid #D8E2D7;
}
.message_single:hover {
background-color: #F3F8EA;
}

14
theme/identica/ie6.css
View File

@ -1,14 +0,0 @@
@charset "UTF-8";
/* CSS Document */
@import url(../default/ie6.css);
#wrap {
background: url(bg-header.gif) repeat-x #FCFFF5;
}
input.disfavor,
input.favor {
text-indent:0px;
text-align:right;
padding-left:25px;
}

3
theme/identica/ie7.css
View File

@ -1,3 +0,0 @@
@charset "UTF-8";
/* CSS Document */
@import url(../default/ie7.css);

BIN
theme/identica/login-bg.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 328 B