From 6e2f04583728714ff937eb1fa3ab34e99bcdb6a6 Mon Sep 17 00:00:00 2001 From: Meitar Moscovitz Date: Mon, 9 Feb 2009 00:02:51 +1100 Subject: Add machine-readable pagination using HTML4.01 ``, etc. These extra `` elements only appear on pages where pagination makes sense. They trigger functionality in some user agents, such as Opera's Navigation Bar for more easily navigating forward and backwards across a paged set of notices, messages, or group lists, etc. --- actions/all.php | 22 ++++++++++++++++++++++ actions/favorited.php | 20 ++++++++++++++++++++ actions/groupmembers.php | 24 +++++++++++++++++++++++- actions/groups.php | 20 ++++++++++++++++++++ actions/inbox.php | 22 ++++++++++++++++++++++ actions/outbox.php | 22 ++++++++++++++++++++++ actions/public.php | 20 ++++++++++++++++++++ actions/replies.php | 22 ++++++++++++++++++++++ actions/showfavorites.php | 22 ++++++++++++++++++++++ actions/showgroup.php | 22 ++++++++++++++++++++++ actions/showstream.php | 22 ++++++++++++++++++++++ actions/tag.php | 22 ++++++++++++++++++++++ lib/action.php | 14 ++++++++++++++ 13 files changed, 273 insertions(+), 1 deletion(-) diff --git a/actions/all.php b/actions/all.php index d75d1b946..76b1bbcdf 100644 --- a/actions/all.php +++ b/actions/all.php @@ -78,6 +78,28 @@ class AllAction extends Action 'title' => sprintf(_('Feed for friends of %s'), $this->user->nickname))); } + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('all', + array('nickname' => $this->user->nickname, + 'page' => $this->page - 1)), + 'title' => _('Next Notices'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('all', + array('nickname' => $this->user->nickname, + 'page' => $this->page + 1)), + 'title' => _('Previous Notices'))); + } + function showLocalNav() { $nav = new PersonalGroupNav($this); diff --git a/actions/favorited.php b/actions/favorited.php index fd5ff413c..367fb6dd6 100644 --- a/actions/favorited.php +++ b/actions/favorited.php @@ -195,4 +195,24 @@ class FavoritedAction extends Action $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, $this->page, 'favorited'); } + + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('favorited', + array('page' => $this->page - 1)), + 'title' => _('Next Notices'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('favorited', + array('page' => $this->page + 1)), + 'title' => _('Previous Notices'))); + } } diff --git a/actions/groupmembers.php b/actions/groupmembers.php index 00f43a9f5..2b2bdba93 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -137,4 +137,26 @@ class GroupmembersAction extends Action $this->page, 'groupmembers', array('nickname' => $this->group->nickname)); } -} \ No newline at end of file + + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('groupmembers', + array('nickname' => $this->group->nickname, + 'page' => $this->page - 1)), + 'title' => _('Next Group Members'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('groupmembers', + array('nickname' => $this->group->nickname, + 'page' => $this->page + 1)), + 'title' => _('Previous Group Members'))); + } +} diff --git a/actions/groups.php b/actions/groups.php index 39dc2232b..b0bf7cfc2 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -129,4 +129,24 @@ class GroupsAction extends Action $gbm = new GroupsByMembersSection($this); $gbm->show(); } + + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('groups', + array('page' => $this->page - 1)), + 'title' => _('Next Groups'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('groups', + array('page' => $this->page + 1)), + 'title' => _('Previous Groups'))); + } } diff --git a/actions/inbox.php b/actions/inbox.php index b553ab26c..d12f3f20a 100644 --- a/actions/inbox.php +++ b/actions/inbox.php @@ -63,6 +63,28 @@ class InboxAction extends MailboxAction } } + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('inbox', + array('nickname' => $this->user->nickname, + 'page' => $this->page - 1)), + 'title' => _('Next Messages'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('inbox', + array('nickname' => $this->user->nickname, + 'page' => $this->page + 1)), + 'title' => _('Previous Messages'))); + } + /** * Retrieve the messages for this user and this page * diff --git a/actions/outbox.php b/actions/outbox.php index c8d7f2812..043b74edc 100644 --- a/actions/outbox.php +++ b/actions/outbox.php @@ -62,6 +62,28 @@ class OutboxAction extends MailboxAction } } + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('outbox', + array('nickname' => $this->user->nickname, + 'page' => $this->page - 1)), + 'title' => _('Next Messages'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('outbox', + array('nickname' => $this->user->nickname, + 'page' => $this->page + 1)), + 'title' => _('Previous Messages'))); + } + /** * retrieve the messages for this user and this page * diff --git a/actions/public.php b/actions/public.php index cc6537f74..25889eee5 100644 --- a/actions/public.php +++ b/actions/public.php @@ -127,6 +127,26 @@ class PublicAction extends Action 'title' => _('Public Stream Feed'))); } + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('public', + array('page' => $this->page - 1)), + 'title' => _('Next Notices'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('public', + array('page' => $this->page + 1)), + 'title' => _('Previous Notices'))); + } + /** * Extra head elements * diff --git a/actions/replies.php b/actions/replies.php index 7eff74a66..5ae99e165 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -141,6 +141,28 @@ class RepliesAction extends Action 'title' => $rsstitle)); } + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('replies', + array('nickname' => $this->user->nickname, + 'page' => $this->page - 1)), + 'title' => _('Next Notices'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('replies', + array('nickname' => $this->user->nickname, + 'page' => $this->page + 1)), + 'title' => _('Previous Notices'))); + } + /** * show the personal group nav * diff --git a/actions/showfavorites.php b/actions/showfavorites.php index 31479e1a7..f0297172a 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -153,6 +153,28 @@ class ShowfavoritesAction extends Action 'title' => $feedtitle)); } + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('showfavorites', + array('nickname' => $this->user->nickname, + 'page' => $this->page - 1)), + 'title' => _('Next Favorite Notices'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('showfavorites', + array('nickname' => $this->user->nickname, + 'page' => $this->page + 1)), + 'title' => _('Previous Favorite Notices'))); + } + /** * show the personal group nav * diff --git a/actions/showgroup.php b/actions/showgroup.php index 7bc68fbc6..7599a8de6 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -326,6 +326,28 @@ class ShowgroupAction extends Action $this->group->nickname))); } + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('showgroup', + array('nickname' => $this->group->nickname, + 'page' => $this->page - 1)), + 'title' => _('Next Notices'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('showgroup', + array('nickname' => $this->group->nickname, + 'page' => $this->page + 1)), + 'title' => _('Previous Notices'))); + } + /** * Fill in the sidebar. * diff --git a/actions/showstream.php b/actions/showstream.php index 28bb8453f..11615ebb0 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -195,6 +195,28 @@ class ShowstreamAction extends Action $this->user->nickname))); } + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('showstream', + array('nickname' => $this->user->nickname, + 'page' => $this->page - 1)), + 'title' => _('Next Notices'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('showstream', + array('nickname' => $this->user->nickname, + 'page' => $this->page + 1)), + 'title' => _('Previous Notices'))); + } + function extraHead() { // FOAF diff --git a/actions/tag.php b/actions/tag.php index 4401f892a..f71f6d342 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -69,6 +69,28 @@ class TagAction extends Action 'title' => sprintf(_('Feed for tag %s'), $this->tag))); } + /** + * Output document relationship links + * + * @return void + */ + function showRelationshipLinks() + { + // Machine-readable pagination + if ($this->page > 1) { + $this->element('link', array('rel' => 'next', + 'href' => common_local_url('tag', + array('tag' => $this->tag, + 'page' => $this->page - 1)), + 'title' => _('Next Notices'))); + } + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url('tag', + array('tag' => $this->tag, + 'page' => $this->page + 1)), + 'title' => _('Previous Notices'))); + } + function showPageNotice() { return sprintf(_('Messages tagged "%s", most recent first'), $this->tag); diff --git a/lib/action.php b/lib/action.php index c4172ada1..ab51d0252 100644 --- a/lib/action.php +++ b/lib/action.php @@ -111,6 +111,7 @@ class Action extends HTMLOutputter // lawsuit $this->showTitle(); $this->showStylesheets(); $this->showScripts(); + $this->showRelationshipLinks(); $this->showOpenSearch(); $this->showFeeds(); $this->showDescription(); @@ -193,6 +194,19 @@ class Action extends HTMLOutputter // lawsuit ' '); } + /** + * Show document relationship links + * + * SHOULD overload + * + * @return nothing + */ + function showRelationshipLinks() + { + // output elements with appropriate HTML4.01 link types: + // http://www.w3.org/TR/html401/types.html#type-links + } + /** * Show OpenSearch headers * -- cgit v1.2.3-54-g00ecf From b240a1719485b15c4a6497b6053c24e8a40a4e3c Mon Sep 17 00:00:00 2001 From: Meitar Moscovitz Date: Tue, 10 Feb 2009 19:42:01 +1100 Subject: Beginning to refactor document relationship links to reduce common code. My attempts here are to mimic the `pagination()` method shared by actions. I'm tentatively adding the `$count` property to actions so that we can query the number of notices ''being displayed'' per page prior to calling the actual `pagination()` method itself, since document relationship `` elements need to be output inside of `showHead()`, before `showContent()`, which is where `pagination()` is, gets called. --- actions/all.php | 15 ++------------- actions/favorited.php | 13 ++----------- actions/groupmembers.php | 15 ++------------- actions/groups.php | 13 ++----------- actions/inbox.php | 15 ++------------- actions/outbox.php | 15 ++------------- actions/public.php | 25 ++++++++++++++----------- actions/replies.php | 15 ++------------- actions/showfavorites.php | 16 +++------------- actions/showgroup.php | 15 ++------------- actions/showstream.php | 15 ++------------- actions/tag.php | 15 ++------------- lib/action.php | 34 ++++++++++++++++++++++++++++++++++ 13 files changed, 71 insertions(+), 150 deletions(-) diff --git a/actions/all.php b/actions/all.php index 76b1bbcdf..4a625207a 100644 --- a/actions/all.php +++ b/actions/all.php @@ -85,19 +85,8 @@ class AllAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('all', - array('nickname' => $this->user->nickname, - 'page' => $this->page - 1)), - 'title' => _('Next Notices'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('all', - array('nickname' => $this->user->nickname, - 'page' => $this->page + 1)), - 'title' => _('Previous Notices'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'all', array('nickname' => $this->user->nickname)); } function showLocalNav() diff --git a/actions/favorited.php b/actions/favorited.php index 367fb6dd6..74920ca7e 100644 --- a/actions/favorited.php +++ b/actions/favorited.php @@ -203,16 +203,7 @@ class FavoritedAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('favorited', - array('page' => $this->page - 1)), - 'title' => _('Next Notices'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('favorited', - array('page' => $this->page + 1)), - 'title' => _('Previous Notices'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'favorited'); } } diff --git a/actions/groupmembers.php b/actions/groupmembers.php index 2b2bdba93..b80f3d90d 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -145,18 +145,7 @@ class GroupmembersAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('groupmembers', - array('nickname' => $this->group->nickname, - 'page' => $this->page - 1)), - 'title' => _('Next Group Members'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('groupmembers', - array('nickname' => $this->group->nickname, - 'page' => $this->page + 1)), - 'title' => _('Previous Group Members'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'groupmembers', array('nickname' => $this->group->nickname)); } } diff --git a/actions/groups.php b/actions/groups.php index b0bf7cfc2..e158698de 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -137,16 +137,7 @@ class GroupsAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('groups', - array('page' => $this->page - 1)), - 'title' => _('Next Groups'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('groups', - array('page' => $this->page + 1)), - 'title' => _('Previous Groups'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'groups', array('nickname' => $this->group->nickname)); } } diff --git a/actions/inbox.php b/actions/inbox.php index d12f3f20a..7b5cf2d20 100644 --- a/actions/inbox.php +++ b/actions/inbox.php @@ -70,19 +70,8 @@ class InboxAction extends MailboxAction */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('inbox', - array('nickname' => $this->user->nickname, - 'page' => $this->page - 1)), - 'title' => _('Next Messages'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('inbox', - array('nickname' => $this->user->nickname, - 'page' => $this->page + 1)), - 'title' => _('Previous Messages'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'inbox', array('nickname' => $this->user->nickname)); } /** diff --git a/actions/outbox.php b/actions/outbox.php index 043b74edc..deef1cc87 100644 --- a/actions/outbox.php +++ b/actions/outbox.php @@ -69,19 +69,8 @@ class OutboxAction extends MailboxAction */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('outbox', - array('nickname' => $this->user->nickname, - 'page' => $this->page - 1)), - 'title' => _('Next Messages'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('outbox', - array('nickname' => $this->user->nickname, - 'page' => $this->page + 1)), - 'title' => _('Previous Messages'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'outbox', array('nickname' => $this->user->nickname)); } /** diff --git a/actions/public.php b/actions/public.php index 25889eee5..eb2a4b1b0 100644 --- a/actions/public.php +++ b/actions/public.php @@ -56,6 +56,18 @@ class PublicAction extends Action var $page = null; + /** + * Number of notices being shown on this page. + */ + // Does this need to be here? Should it be? + // If it does, this property needs to be + // added to other actions as well, like $page. + // I'm trying to find a way to capture the + // output of the $cnt variable from this + // action's showContent() method but need + // to do so earlier, I think...? + var $count = null; + function isReadOnly() { return true; @@ -134,17 +146,8 @@ class PublicAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('public', - array('page' => $this->page - 1)), - 'title' => _('Next Notices'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('public', - array('page' => $this->page + 1)), - 'title' => _('Previous Notices'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'public'); } /** diff --git a/actions/replies.php b/actions/replies.php index 5ae99e165..7c24b554e 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -148,19 +148,8 @@ class RepliesAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('replies', - array('nickname' => $this->user->nickname, - 'page' => $this->page - 1)), - 'title' => _('Next Notices'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('replies', - array('nickname' => $this->user->nickname, - 'page' => $this->page + 1)), - 'title' => _('Previous Notices'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'replies', array('nickname' => $this->user->nickname)); } /** diff --git a/actions/showfavorites.php b/actions/showfavorites.php index f0297172a..585b3b75a 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -160,21 +160,11 @@ class ShowfavoritesAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('showfavorites', - array('nickname' => $this->user->nickname, - 'page' => $this->page - 1)), - 'title' => _('Next Favorite Notices'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('showfavorites', - array('nickname' => $this->user->nickname, - 'page' => $this->page + 1)), - 'title' => _('Previous Favorite Notices'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'showfavorites', array('nickname' => $this->user->nickname)); } + /** * show the personal group nav * diff --git a/actions/showgroup.php b/actions/showgroup.php index 7599a8de6..a2b40f994 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -333,19 +333,8 @@ class ShowgroupAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('showgroup', - array('nickname' => $this->group->nickname, - 'page' => $this->page - 1)), - 'title' => _('Next Notices'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('showgroup', - array('nickname' => $this->group->nickname, - 'page' => $this->page + 1)), - 'title' => _('Previous Notices'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'showgroup', array('nickname' => $this->group->nickname)); } /** diff --git a/actions/showstream.php b/actions/showstream.php index 0c8fea182..1779c70f2 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -202,19 +202,8 @@ class ShowstreamAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('showstream', - array('nickname' => $this->user->nickname, - 'page' => $this->page - 1)), - 'title' => _('Next Notices'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('showstream', - array('nickname' => $this->user->nickname, - 'page' => $this->page + 1)), - 'title' => _('Previous Notices'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'showstream', array('nickname' => $this->user->nickname)); } function extraHead() diff --git a/actions/tag.php b/actions/tag.php index f71f6d342..2a564a25d 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -76,19 +76,8 @@ class TagAction extends Action */ function showRelationshipLinks() { - // Machine-readable pagination - if ($this->page > 1) { - $this->element('link', array('rel' => 'next', - 'href' => common_local_url('tag', - array('tag' => $this->tag, - 'page' => $this->page - 1)), - 'title' => _('Next Notices'))); - } - $this->element('link', array('rel' => 'prev', - 'href' => common_local_url('tag', - array('tag' => $this->tag, - 'page' => $this->page + 1)), - 'title' => _('Previous Notices'))); + $this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME + $this->page, 'tag', array('tag' => $this->tag)); } function showPageNotice() diff --git a/lib/action.php b/lib/action.php index 8d0fea7af..80a8969fa 100644 --- a/lib/action.php +++ b/lib/action.php @@ -938,4 +938,38 @@ class Action extends HTMLOutputter // lawsuit $this->elementEnd('div'); } } + + /** + * Generate document metadata for sequential navigation + * + * @param boolean $have_before is there something before? + * @param boolean $have_after is there something after? + * @param integer $page current page + * @param string $action current action + * @param array $args rest of query arguments + * + * @return nothing + */ + function sequenceRelationships($have_next, $have_previous, $page, $action, $args=null) + { + // Outputs machine-readable pagination in elements. + // Pattern taken from $this->pagination() method. + + // "next" is equivalent to "after" + if ($have_next) { + $pargs = array('page' => $page-1); + $newargs = $args ? array_merge($args, $pargs) : $pargs; + $this->element('link', array('rel' => 'next', + 'href' => common_local_url($action, $newargs), + 'title' => _('Next'))); + } + // "previous" is equivalent to "before" + if ($have_previous=true) { // FIXME + $pargs = array('page' => $page+1); + $newargs = $args ? array_merge($args, $pargs) : $pargs; + $this->element('link', array('rel' => 'prev', + 'href' => common_local_url($action, $newargs), + 'title' => _('Previous'))); + } + } } -- cgit v1.2.3-54-g00ecf From 1ba3ac9ee3f00472e0b7f8f25955967ab816a3fd Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Sun, 8 Mar 2009 08:45:32 +0100 Subject: Make OMB work if the configured domain name does not exclusively contain lower case letters. If the configured domain is mixed-case OAuth throws invalidsignature errors. The current URL is part of the signated parts; since the consumer does not pass the current URL, the service has to get it itself and add it to the other OAuth params for signature rebuilding. OAuth.php uses $_SERVER for this, however, the domain is lcased in $_SERVER. Hence we pass the complete current URL as generated by common_local_url to OAuthRequest. --- actions/accesstoken.php | 2 +- actions/finishremotesubscribe.php | 2 +- actions/postnotice.php | 2 +- actions/requesttoken.php | 2 +- actions/updateprofile.php | 2 +- actions/userauthorization.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/actions/accesstoken.php b/actions/accesstoken.php index 77fdf6aef..bb68d3314 100644 --- a/actions/accesstoken.php +++ b/actions/accesstoken.php @@ -59,7 +59,7 @@ class AccesstokenAction extends Action try { common_debug('getting request from env variables', __FILE__); common_remove_magic_from_request(); - $req = OAuthRequest::from_request(); + $req = OAuthRequest::from_request('POST', common_locale_url('accesstoken')); common_debug('getting a server', __FILE__); $server = omb_oauth_server(); common_debug('fetching the access token', __FILE__); diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php index eaf57c2d8..6d73ee234 100644 --- a/actions/finishremotesubscribe.php +++ b/actions/finishremotesubscribe.php @@ -44,7 +44,7 @@ class FinishremotesubscribeAction extends Action common_debug('stored request: '.print_r($omb,true), __FILE__); common_remove_magic_from_request(); - $req = OAuthRequest::from_request(); + $req = OAuthRequest::from_request('POST', common_local_url('finishuserauthorization')); $token = $req->get_parameter('oauth_token'); diff --git a/actions/postnotice.php b/actions/postnotice.php index c32d8ca94..3e98b3cd5 100644 --- a/actions/postnotice.php +++ b/actions/postnotice.php @@ -28,7 +28,7 @@ class PostnoticeAction extends Action parent::handle($args); try { common_remove_magic_from_request(); - $req = OAuthRequest::from_request(); + $req = OAuthRequest::from_request('POST', common_local_url('postnotice')); # Note: server-to-server function! $server = omb_oauth_server(); list($consumer, $token) = $server->verify_request($req); diff --git a/actions/requesttoken.php b/actions/requesttoken.php index ca253b97a..4e6f92913 100644 --- a/actions/requesttoken.php +++ b/actions/requesttoken.php @@ -69,7 +69,7 @@ class RequesttokenAction extends Action parent::handle($args); try { common_remove_magic_from_request(); - $req = OAuthRequest::from_request(); + $req = OAuthRequest::from_request('POST', common_local_url('requesttoken')); $server = omb_oauth_server(); $token = $server->fetch_request_token($req); print $token; diff --git a/actions/updateprofile.php b/actions/updateprofile.php index 7dc52fda9..08cb31ae0 100644 --- a/actions/updateprofile.php +++ b/actions/updateprofile.php @@ -29,7 +29,7 @@ class UpdateprofileAction extends Action parent::handle($args); try { common_remove_magic_from_request(); - $req = OAuthRequest::from_request(); + $req = OAuthRequest::from_request('POST', common_local_url('updateprofile')); # Note: server-to-server function! $server = omb_oauth_server(); list($consumer, $token) = $server->verify_request($req); diff --git a/actions/userauthorization.php b/actions/userauthorization.php index 6a76e3a4c..9eb1e8836 100644 --- a/actions/userauthorization.php +++ b/actions/userauthorization.php @@ -382,7 +382,7 @@ class UserauthorizationAction extends Action function getNewRequest() { common_remove_magic_from_request(); - $req = OAuthRequest::from_request(); + $req = OAuthRequest::from_request('GET', common_local_url('userauthorization')); return $req; } -- cgit v1.2.3-54-g00ecf From e9e75fc9d5f44b2ffe10602a3bd183cccb7da4ec Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 13 Apr 2009 15:49:26 -0400 Subject: isReadOnly() now takes arguments Add an array of arguments to isReadOnly() method of actions, to let them change their results depending on what actions are called. Primarily used by the 'api' action. Ideally in the future that will be multiple actions. But this might still be useful. --- actions/all.php | 2 +- actions/api.php | 13 ++++++------- actions/avatarbynickname.php | 2 +- actions/doc.php | 2 +- actions/favorited.php | 2 +- actions/featured.php | 2 +- actions/foaf.php | 2 +- actions/groupbyid.php | 2 +- actions/groupmembers.php | 2 +- actions/grouprss.php | 2 +- actions/groups.php | 2 +- actions/invite.php | 2 +- actions/login.php | 2 +- actions/logout.php | 2 +- actions/microsummary.php | 2 +- actions/noticesearchrss.php | 2 +- actions/nudge.php | 2 +- actions/opensearch.php | 2 +- actions/public.php | 2 +- actions/publicrss.php | 2 +- actions/publictagcloud.php | 2 +- actions/publicxrds.php | 2 +- actions/replies.php | 2 +- actions/repliesrss.php | 2 +- actions/requesttoken.php | 2 +- actions/showfavorites.php | 2 +- actions/showgroup.php | 2 +- actions/showmessage.php | 2 +- actions/shownotice.php | 2 +- actions/showstream.php | 2 +- actions/subscribers.php | 2 +- actions/sup.php | 2 +- actions/tag.php | 2 +- actions/tagrss.php | 2 +- actions/twitapisearchjson.php | 2 +- actions/userbyid.php | 2 +- actions/usergroups.php | 2 +- actions/userrss.php | 2 +- actions/xrds.php | 2 +- index.php | 2 +- lib/action.php | 5 ++++- lib/error.php | 2 +- lib/galleryaction.php | 2 +- lib/peoplesearchresults.php | 2 +- lib/personal.php | 2 +- lib/searchaction.php | 2 +- 46 files changed, 54 insertions(+), 52 deletions(-) diff --git a/actions/all.php b/actions/all.php index f5bbfe2e3..69890a70c 100644 --- a/actions/all.php +++ b/actions/all.php @@ -25,7 +25,7 @@ require_once INSTALLDIR.'/lib/feedlist.php'; class AllAction extends ProfileAction { - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/api.php b/actions/api.php index c18d551b6..e40a18798 100644 --- a/actions/api.php +++ b/actions/api.php @@ -134,8 +134,8 @@ class ApiAction extends Action 'favorites/favorites'); $fullname = "$this->api_action/$this->api_method"; - - // If the site is "private", all API methods except laconica/config + + // If the site is "private", all API methods except laconica/config // need authentication if (common_config('site', 'private')) { return $fullname != 'laconica/config' || false; @@ -180,11 +180,11 @@ class ApiAction extends Action } } - function isReadOnly() + function isReadOnly($args)($args) { - # NOTE: before handle(), can't use $this->arg - $apiaction = $_REQUEST['apiaction']; - $method = $_REQUEST['method']; + $apiaction = $args['apiaction']; + $method = $args['method']; + list($cmdtext, $fmt) = explode('.', $method); static $write_methods = array( @@ -207,5 +207,4 @@ class ApiAction extends Action return false; } - } diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php index ca58c9653..e92a99372 100644 --- a/actions/avatarbynickname.php +++ b/actions/avatarbynickname.php @@ -98,7 +98,7 @@ class AvatarbynicknameAction extends Action common_redirect($url, 302); } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/doc.php b/actions/doc.php index ebffb7c15..e6508030b 100644 --- a/actions/doc.php +++ b/actions/doc.php @@ -108,7 +108,7 @@ class DocAction extends Action return ucfirst($this->title); } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/favorited.php b/actions/favorited.php index 09ab1216a..c902d80f5 100644 --- a/actions/favorited.php +++ b/actions/favorited.php @@ -85,7 +85,7 @@ class FavoritedAction extends Action * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/featured.php b/actions/featured.php index 86fd3f374..79eba2aa6 100644 --- a/actions/featured.php +++ b/actions/featured.php @@ -50,7 +50,7 @@ class FeaturedAction extends Action { var $page = null; - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/foaf.php b/actions/foaf.php index 416935b1b..2d5b78d12 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -25,7 +25,7 @@ define('BOTH', 0); class FoafAction extends Action { - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/groupbyid.php b/actions/groupbyid.php index 678119a94..7d327d56c 100644 --- a/actions/groupbyid.php +++ b/actions/groupbyid.php @@ -59,7 +59,7 @@ class GroupbyidAction extends Action * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/groupmembers.php b/actions/groupmembers.php index 00f43a9f5..a90108e4d 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -48,7 +48,7 @@ class GroupmembersAction extends Action { var $page = null; - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/grouprss.php b/actions/grouprss.php index de76a5960..a9a2eef87 100644 --- a/actions/grouprss.php +++ b/actions/grouprss.php @@ -57,7 +57,7 @@ class groupRssAction extends Rss10Action * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/groups.php b/actions/groups.php index 39dc2232b..26b52a5fc 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -51,7 +51,7 @@ class GroupsAction extends Action var $page = null; var $profile = null; - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/invite.php b/actions/invite.php index df6e3b714..7e52cdbcc 100644 --- a/actions/invite.php +++ b/actions/invite.php @@ -27,7 +27,7 @@ class InviteAction extends Action var $subbed = null; var $sent = null; - function isReadOnly() + function isReadOnly($args) { return false; } diff --git a/actions/login.php b/actions/login.php index 59c6b4874..50de83f6f 100644 --- a/actions/login.php +++ b/actions/login.php @@ -55,7 +55,7 @@ class LoginAction extends Action * @return boolean false */ - function isReadOnly() + function isReadOnly($args) { return false; } diff --git a/actions/logout.php b/actions/logout.php index b7681be38..9f3bfe247 100644 --- a/actions/logout.php +++ b/actions/logout.php @@ -52,7 +52,7 @@ class LogoutAction extends Action * * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return false; } diff --git a/actions/microsummary.php b/actions/microsummary.php index 065a2e0eb..0b408ec95 100644 --- a/actions/microsummary.php +++ b/actions/microsummary.php @@ -74,7 +74,7 @@ class MicrosummaryAction extends Action print $user->nickname . ': ' . $notice->content; } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php index ba5276d06..f6da969ee 100644 --- a/actions/noticesearchrss.php +++ b/actions/noticesearchrss.php @@ -92,7 +92,7 @@ class NoticesearchrssAction extends Rss10Action return null; } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/nudge.php b/actions/nudge.php index b4e5e01dd..c23d3e643 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -124,7 +124,7 @@ class NudgeAction extends Action } } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/opensearch.php b/actions/opensearch.php index 2eb818306..d1f4895ce 100644 --- a/actions/opensearch.php +++ b/actions/opensearch.php @@ -84,7 +84,7 @@ class OpensearchAction extends Action $this->endXML(); } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/public.php b/actions/public.php index 5a380de9a..27153f131 100644 --- a/actions/public.php +++ b/actions/public.php @@ -56,7 +56,7 @@ class PublicAction extends Action var $page = null; - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/publicrss.php b/actions/publicrss.php index 77e26e0f4..bc52f2952 100644 --- a/actions/publicrss.php +++ b/actions/publicrss.php @@ -102,7 +102,7 @@ class PublicrssAction extends Rss10Action // nop } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php index 855cfed9b..e9f33d58b 100644 --- a/actions/publictagcloud.php +++ b/actions/publictagcloud.php @@ -47,7 +47,7 @@ define('TAGS_PER_PAGE', 100); class PublictagcloudAction extends Action { - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/publicxrds.php b/actions/publicxrds.php index 2c52f1246..283a932ca 100644 --- a/actions/publicxrds.php +++ b/actions/publicxrds.php @@ -54,7 +54,7 @@ class PublicxrdsAction extends Action * * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/replies.php b/actions/replies.php index 2769cb422..eac4d0a3a 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -196,7 +196,7 @@ class RepliesAction extends Action $this->elementEnd('div'); } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/repliesrss.php b/actions/repliesrss.php index 985318bf1..2017c4309 100644 --- a/actions/repliesrss.php +++ b/actions/repliesrss.php @@ -83,7 +83,7 @@ class RepliesrssAction extends Rss10Action return ($avatar) ? $avatar->url : null; } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/requesttoken.php b/actions/requesttoken.php index ca253b97a..fb577fdd5 100644 --- a/actions/requesttoken.php +++ b/actions/requesttoken.php @@ -52,7 +52,7 @@ class RequesttokenAction extends Action * * @return boolean false */ - function isReadOnly() + function isReadOnly($args) { return false; } diff --git a/actions/showfavorites.php b/actions/showfavorites.php index 4d4349505..e8cf1cb01 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -58,7 +58,7 @@ class ShowfavoritesAction extends Action * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/showgroup.php b/actions/showgroup.php index 79445851f..7e86a79f1 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -60,7 +60,7 @@ class ShowgroupAction extends Action * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/showmessage.php b/actions/showmessage.php index 572a71739..4fcaadbe8 100644 --- a/actions/showmessage.php +++ b/actions/showmessage.php @@ -177,7 +177,7 @@ class ShowmessageAction extends MailboxAction return ''; } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/shownotice.php b/actions/shownotice.php index ccae49bb3..2c469c9de 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -106,7 +106,7 @@ class ShownoticeAction extends Action * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/showstream.php b/actions/showstream.php index ce237dae2..c1a2c337a 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -56,7 +56,7 @@ require_once INSTALLDIR.'/lib/feedlist.php'; class ShowstreamAction extends ProfileAction { - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/subscribers.php b/actions/subscribers.php index 7ebb54d33..d91a7d4fd 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -130,7 +130,7 @@ class SubscribersList extends ProfileList $bf->show(); } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/sup.php b/actions/sup.php index 246b3299d..691153d6a 100644 --- a/actions/sup.php +++ b/actions/sup.php @@ -79,7 +79,7 @@ class SupAction extends Action return $updates; } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/tag.php b/actions/tag.php index c413bf8c3..7f82c2a58 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -87,7 +87,7 @@ class TagAction extends Action $this->page, 'tag', array('tag' => $this->tag)); } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/tagrss.php b/actions/tagrss.php index a77fa12c9..83cf3afe2 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -65,7 +65,7 @@ class TagrssAction extends Rss10Action return $c; } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php index 0f9f523a1..b0e3be687 100644 --- a/actions/twitapisearchjson.php +++ b/actions/twitapisearchjson.php @@ -142,7 +142,7 @@ class TwitapisearchjsonAction extends TwitterapiAction * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/userbyid.php b/actions/userbyid.php index 1e30d1aac..4a985fcd7 100644 --- a/actions/userbyid.php +++ b/actions/userbyid.php @@ -50,7 +50,7 @@ class UserbyidAction extends Action * * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/usergroups.php b/actions/usergroups.php index 06b2334bf..e3088dcbd 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -52,7 +52,7 @@ class UsergroupsAction extends Action var $page = null; var $profile = null; - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/userrss.php b/actions/userrss.php index d3bf352d8..5861d9ee3 100644 --- a/actions/userrss.php +++ b/actions/userrss.php @@ -96,7 +96,7 @@ class UserrssAction extends Rss10Action parent::initRss($limit); } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/actions/xrds.php b/actions/xrds.php index 075831803..1335b6b80 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -52,7 +52,7 @@ class XrdsAction extends Action * * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/index.php b/index.php index e83d08c13..e24bde917 100644 --- a/index.php +++ b/index.php @@ -128,7 +128,7 @@ function main() // XXX: find somewhere for this little block to live - if (common_config('db', 'mirror') && $action_obj->isReadOnly()) { + if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) { if (is_array(common_config('db', 'mirror'))) { // "load balancing", ha ha $arr = common_config('db', 'mirror'); diff --git a/lib/action.php b/lib/action.php index cc98d4445..673549246 100644 --- a/lib/action.php +++ b/lib/action.php @@ -791,9 +791,12 @@ class Action extends HTMLOutputter // lawsuit * * MAY override * + * @param array $args other arguments + * * @return boolean is read only action? */ - function isReadOnly() + + function isReadOnly($args)($args) { return false; } diff --git a/lib/error.php b/lib/error.php index 526d9f81b..282682133 100644 --- a/lib/error.php +++ b/lib/error.php @@ -93,7 +93,7 @@ class ErrorAction extends Action return $this->message; } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/lib/galleryaction.php b/lib/galleryaction.php index 8e21d7393..0484918ce 100644 --- a/lib/galleryaction.php +++ b/lib/galleryaction.php @@ -76,7 +76,7 @@ class GalleryAction extends Action return true; } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/lib/peoplesearchresults.php b/lib/peoplesearchresults.php index f8ab7cf3b..d3f840852 100644 --- a/lib/peoplesearchresults.php +++ b/lib/peoplesearchresults.php @@ -67,7 +67,7 @@ class PeopleSearchResults extends ProfileList return preg_replace($this->pattern, '\\1', htmlspecialchars($text)); } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/lib/personal.php b/lib/personal.php index e46350c63..f92732375 100644 --- a/lib/personal.php +++ b/lib/personal.php @@ -47,7 +47,7 @@ class PersonalAction extends Action var $user = null; - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/lib/searchaction.php b/lib/searchaction.php index e7ad4affd..e74450e11 100644 --- a/lib/searchaction.php +++ b/lib/searchaction.php @@ -51,7 +51,7 @@ class SearchAction extends Action * * @return boolean true */ - function isReadOnly() + function isReadOnly($args) { return true; } -- cgit v1.2.3-54-g00ecf From 4c9be4d566c4d4b6e846935cbabd951f5d59259d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 13 Apr 2009 15:52:15 -0400 Subject: typo in api.php --- actions/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/api.php b/actions/api.php index e40a18798..d2f0a2eff 100644 --- a/actions/api.php +++ b/actions/api.php @@ -180,7 +180,7 @@ class ApiAction extends Action } } - function isReadOnly($args)($args) + function isReadOnly($args) { $apiaction = $args['apiaction']; $method = $args['method']; -- cgit v1.2.3-54-g00ecf From 4684d34713a8057387750bc52802d0c0475ec926 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 13 Apr 2009 15:54:16 -0400 Subject: typo in lib action --- lib/action.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/action.php b/lib/action.php index 673549246..1ba062812 100644 --- a/lib/action.php +++ b/lib/action.php @@ -796,7 +796,7 @@ class Action extends HTMLOutputter // lawsuit * @return boolean is read only action? */ - function isReadOnly($args)($args) + function isReadOnly($args) { return false; } -- cgit v1.2.3-54-g00ecf From 01695dc3465c8198123c254816f9a93a35b6c773 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 13 Apr 2009 15:03:34 -0700 Subject: Fix bad dates in API's JSON search results --- lib/jsonsearchresultslist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php index 0cdcf0c51..f786c20a8 100644 --- a/lib/jsonsearchresultslist.php +++ b/lib/jsonsearchresultslist.php @@ -232,7 +232,7 @@ class ResultItem $this->profile_image_url = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE); - $this->created_at = date('r', $this->notice->created); + $this->created_at = common_date_rfc2822($this->notice->created); } /** -- cgit v1.2.3-54-g00ecf From 9f2e2e4b2c1b428a1892c57c7194fbc5ede5b125 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 14 Apr 2009 11:50:59 -0700 Subject: Notice sources: Fixed Nambu, added Tricklepost and sorted the list. --- db/notice_source.sql | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/db/notice_source.sql b/db/notice_source.sql index ac23f14aa..d5124e223 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -1,29 +1,28 @@ INSERT INTO notice_source (code, name, url, created) VALUES - ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()), - ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), - ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()), - ('HelloTxt','HelloTxt','http://hellotxt.com/', now()), - ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), - ('LaTwit','LaTwit','http://latwit.mac65.com/', now()), - ('Nambu','Nambu','http://www.nambu.com/', now()), - ('Pikchur','Pikchur','http://www.pikchur.com/', now()), - ('Ping.fm','Ping.fm','http://ping.fm/', now()), - ('Twidge','Twidge','http://software.complete.org/twidge', now()), - ('Updating.Me','Updating.Me','http://updating.me/', now()), + ('adium', 'Adium', 'http://www.adiumx.com/', now()), ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()), ('bti','bti','http://gregkh.github.com/bti/', now()), ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()), ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()), + ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()), + ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), + ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()), + ('HelloTxt','HelloTxt','http://hellotxt.com/', now()), ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()), ('identichat','identichat','http://identichat.prosody.im/', now()), + ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()), + ('LaTwit','LaTwit','http://latwit.mac65.com/', now()), ('maisha', 'Maisha', 'http://maisha.grango.org/', now()), ('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()), ('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()), ('moconica','Moconica','http://moconica.com/', now()), + ('nambu','Nambu','http://www.nambu.com/', now()), ('peoplebrowsr', 'PeopleBrowsr', 'http://www.peoplebrowsr.com/', now()), + ('Pikchur','Pikchur','http://www.pikchur.com/', now()), + ('Ping.fm','Ping.fm','http://ping.fm/', now()), ('pocketwit','PockeTwit','http://code.google.com/p/pocketwit/', now()), ('posty','Posty','http://spreadingfunkyness.com/posty/', now()), ('royalewithcheese','Royale With Cheese','http://p.hellyeah.org/', now()), @@ -35,9 +34,11 @@ VALUES ('tarpipe','tarpipe','http://tarpipe.com/', now()), ('tjunar','Tjunar','http://nederflash.nl/boek/titels/tjunar-air', now()), ('tr.im','tr.im','http://tr.im/', now()), + ('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()), ('tweenky','Tweenky','http://beta.tweenky.com/', now()), ('twhirl','Twhirl','http://www.twhirl.org/', now()), ('twibble','twibble','http://www.twibble.de/', now()), + ('Twidge','Twidge','http://software.complete.org/twidge', now()), ('twidge','Twidge','http://software.complete.org/twidge', now()), ('twidroid','twidroid','http://www.twidroid.com/', now()), ('twittelator','Twittelator','http://www.stone.com/iPhone/Twittelator/', now()), @@ -47,6 +48,6 @@ VALUES ('twittertools','Twitter Tools','http://wordpress.org/extend/plugins/twitter-tools/', now()), ('twitux','Twitux','http://live.gnome.org/DanielMorales/Twitux', now()), ('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()), + ('Updating.Me','Updating.Me','http://updating.me/', now()), ('urfastr','urfastr','http://urfastr.net/', now()), - ('adium', 'Adium', 'http://www.adiumx.com/', now()), ('yatca','Yatca','http://www.yatca.com/', now()); -- cgit v1.2.3-54-g00ecf From b1940bcb7b028b993b26cd3c36f4fdbbc79c96e6 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 14 Apr 2009 16:01:02 -0400 Subject: escape slash in regexp --- plugins/LinkbackPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php index 56a26176b..881ead99e 100644 --- a/plugins/LinkbackPlugin.php +++ b/plugins/LinkbackPlugin.php @@ -99,7 +99,7 @@ class LinkbackPlugin extends Plugin if (array_key_exists('X-Pingback', $result->headers)) { $pb = $result->headers['X-Pingback']; - } else if (preg_match('//', + } else if (preg_match('//', $result->body, $match)) { $pb = $match[1]; -- cgit v1.2.3-54-g00ecf From b142c260108f43636b69adb90d5a27ffa44f0f74 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 14 Apr 2009 16:02:09 -0400 Subject: Make stuff work with no base --- lib/action.php | 4 ---- theme/default/css/display.css | 10 ++-------- theme/identica/css/display.css | 10 ++-------- theme/iphone/display.css | 16 +++++++--------- 4 files changed, 11 insertions(+), 29 deletions(-) diff --git a/lib/action.php b/lib/action.php index 1ba062812..b02f525f0 100644 --- a/lib/action.php +++ b/lib/action.php @@ -192,10 +192,6 @@ class Action extends HTMLOutputter // lawsuit { if (Event::handle('StartShowStyles', array($this))) { if (Event::handle('StartShowLaconicaStyles', array($this))) { - $this->element('link', array('rel' => 'stylesheet', - 'type' => 'text/css', - 'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION, - 'media' => 'screen, projection, tv')); $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, diff --git a/theme/default/css/display.css b/theme/default/css/display.css index c5d694610..69a600cc2 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -7,6 +7,8 @@ * @link http://laconi.ca/ */ +@import url(../../base/css/display.css); + html, body, a:active { @@ -70,7 +72,6 @@ border-top-color:#D1D9E4; border-top-color:#97BFD1; } - #content .notice p.entry-content a:visited { background-color:#fcfcfc; } @@ -82,7 +83,6 @@ background-color:#fcfffc; background-color:#CEE1E9; } - #notice_text-count { color:#333; } @@ -112,7 +112,6 @@ background-color:rgba(255, 255, 255, 0.2); background-color:rgba(255, 255, 255, 0.7); } - .error { background-color:#F7E8E8; } @@ -120,7 +119,6 @@ background-color:#F7E8E8; background-color:#EFF3DC; } - #anon_notice { background-color:#97BFD1; color:#fff; @@ -131,7 +129,6 @@ border-color:#fff; background-color:#A9BF4F; } - #export_data li a { background-repeat:no-repeat; background-position:0 45%; @@ -184,8 +181,6 @@ background-image:url(../images/icons/twotone/green/mail.gif); background-image:url(../images/icons/twotone/green/shield.gif); } - - /* NOTICES */ .notices li.over { background-color:#fcfcfc; @@ -228,7 +223,6 @@ background-color:#fcfcfc; } /*END: NOTICES */ - #new_group a { background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c32b6269d..d05578d43 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -7,6 +7,8 @@ * @link http://laconi.ca/ */ +@import url(../../base/css/display.css); + html, body, a:active { @@ -70,7 +72,6 @@ border-top-color:#CEE1E9; border-top-color:#87B4C8; } - #content .notice p.entry-content a:visited { background-color:#fcfcfc; } @@ -82,7 +83,6 @@ background-color:#fcfffc; background-color:#CEE1E9; } - #notice_text-count { color:#333; } @@ -112,7 +112,6 @@ background-color:rgba(135, 180, 200, 0.3); background-color:rgba(255, 255, 255, 0.7); } - .error { background-color:#F7E8E8; } @@ -120,7 +119,6 @@ background-color:#F7E8E8; background-color:#EFF3DC; } - #anon_notice { background-color:#87B4C8; color:#fff; @@ -131,7 +129,6 @@ border-color:#fff; background-color:#9BB43E; } - #export_data li a { background-repeat:no-repeat; background-position:0 45%; @@ -184,8 +181,6 @@ background-image:url(../images/icons/twotone/green/mail.gif); background-image:url(../images/icons/twotone/green/shield.gif); } - - /* NOTICES */ .notices li.over { background-color:#fcfcfc; @@ -228,7 +223,6 @@ background-color:#fcfcfc; } /*END: NOTICES */ - #new_group a { background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; } diff --git a/theme/iphone/display.css b/theme/iphone/display.css index 6ac471c1e..1838a8e86 100644 --- a/theme/iphone/display.css +++ b/theme/iphone/display.css @@ -2,6 +2,8 @@ /* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */ /* Simplified for mobile by Ken Sheppardson http://identi.ca/kshep */ +@import url(../../base/css/display.css); + html {} body { width: 100%; @@ -28,7 +30,6 @@ h1 { font-size: 1.2em; } - #wrap { margin: 0; } @@ -196,7 +197,7 @@ p#branding a { } .instructions a:hover, .success a:hover, .error a:hover { color: #FCFFF5; -} +} .success { clear: both; float: left; @@ -210,7 +211,6 @@ p#branding a { background-color: #ce3728; } - /* ----- Stream -----*/ #notices { @@ -273,7 +273,7 @@ p.time { p.time a { color: #91AA9D; } - + /* ----- Profile -----*/ #profile { clear: both; @@ -356,7 +356,7 @@ dl.statistics { clear: left; float: left; width: 200px; -} +} .statistics dd { float: left; } @@ -402,8 +402,6 @@ ul.subscriptions li, ul.subscribers li { } /* ----- End Subscriptions & Subscribers -----*/ - - #pagination { margin: 18px auto; } @@ -488,7 +486,7 @@ input#submit:hover, input.submit:hover { input.checkbox { width: auto; border: 0; -} +} textarea, input { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 1em; @@ -629,7 +627,7 @@ input#openid_url { #profiles a:hover { text-decoration: underline; } - + .profile_single { clear: both; display: block; -- cgit v1.2.3-54-g00ecf From 20394664957a202cc86cc48ee2d115032e82c58a Mon Sep 17 00:00:00 2001 From: Robin Millette Date: Tue, 14 Apr 2009 23:03:19 +0000 Subject: trac#1223 Show most popular notices per tag in the tag page sidebar. --- actions/tag.php | 7 +++++++ lib/popularnoticesection.php | 25 +++++++++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/actions/tag.php b/actions/tag.php index d15f64498..cb6572b96 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -45,6 +45,13 @@ class TagAction extends Action return true; } + function showSections() + { + $pop = new PopularNoticeSection($this); + $pop->show(); + } + + function title() { if ($this->page == 1) { diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index 0505f0fa9..a8d47ef54 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -50,17 +50,26 @@ class PopularNoticeSection extends NoticeSection { if (common_config('db', 'type') == 'pgsql') { $weightexpr='sum(exp(-extract(epoch from (now() - fave.modified)) / %s))'; + if (!empty($this->out->tag)) { + $tag = pg_escape_string($this->tag); + } } else { $weightexpr='sum(exp(-(now() - fave.modified) / %s))'; + if (!empty($this->out->tag)) { + $tag = mysql_escape_string($this->out->tag); + } } - - $qry = 'SELECT notice.*, '. - $weightexpr . ' as weight ' . - 'FROM notice JOIN fave ON notice.id = fave.notice_id ' . - 'GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' . - 'notice.rendered,notice.url,notice.created,notice.modified,' . - 'notice.reply_to,notice.is_local,notice.source ' . - 'ORDER BY weight DESC'; + $qry = "SELECT notice.*, $weightexpr as weight "; + if(isset($tag)) { + $qry .= 'FROM notice_tag, notice JOIN fave ON notice.id = fave.notice_id ' . + "WHERE notice.id = notice_tag.notice_id and '$tag' = notice_tag.tag"; + } else { + $qry .= 'FROM notice JOIN fave ON notice.id = fave.notice_id'; + } + $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' . + 'notice.rendered,notice.url,notice.created,notice.modified,' . + 'notice.reply_to,notice.is_local,notice.source ' . + 'ORDER BY weight DESC'; $offset = 0; $limit = NOTICES_PER_SECTION + 1; -- cgit v1.2.3-54-g00ecf From 7095c93f66fa2fc4fdae57276ca66ad777788afd Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 14 Apr 2009 23:13:02 +0000 Subject: Simpler separation of themes. New themes can either make use of the default styles or make their own. --- lib/action.php | 18 +- theme/base/css/display.css | 1177 +++++++++++++++ theme/base/css/facebookapp.css | 100 ++ theme/base/css/farbtastic.css | 32 + theme/base/css/ie.css | 32 + theme/base/css/ie6.css | 30 + theme/base/css/jquery.Jcrop.css | 45 + theme/base/css/mobile.css | 150 ++ theme/base/css/print.css | 36 + theme/base/css/thickbox.css | 163 ++ theme/base/default-avatar-mini.png | Bin 0 -> 646 bytes theme/base/default-avatar-profile.png | Bin 0 -> 2853 bytes theme/base/default-avatar-stream.png | Bin 0 -> 1487 bytes theme/base/images/icons/icon_atom.png | Bin 0 -> 820 bytes theme/base/images/icons/icon_foaf.gif | Bin 0 -> 1144 bytes theme/base/images/icons/icon_rss.png | Bin 0 -> 777 bytes theme/base/images/icons/icon_vcard.gif | Bin 0 -> 331 bytes .../base/images/icons/twotone/green/arrow-left.gif | Bin 0 -> 73 bytes .../images/icons/twotone/green/arrow-right.gif | Bin 0 -> 74 bytes .../images/icons/twotone/green/disfavourite.gif | Bin 0 -> 88 bytes theme/base/images/icons/twotone/green/edit.gif | Bin 0 -> 75 bytes .../base/images/icons/twotone/green/favourite.gif | Bin 0 -> 73 bytes theme/base/images/icons/twotone/green/mail.gif | Bin 0 -> 82 bytes theme/base/images/icons/twotone/green/news.gif | Bin 0 -> 76 bytes theme/base/images/icons/twotone/green/quote.gif | Bin 0 -> 79 bytes theme/base/images/icons/twotone/green/reply.gif | Bin 0 -> 79 bytes theme/base/images/icons/twotone/green/shield.gif | Bin 0 -> 85 bytes theme/base/images/icons/twotone/green/trash.gif | Bin 0 -> 77 bytes theme/base/images/illustrations/illu_jcrop.gif | Bin 0 -> 329 bytes .../illustrations/illu_progress_loading-01.gif | Bin 0 -> 5886 bytes theme/base/logo.png | Bin 0 -> 4988 bytes theme/cloudy/base/css/display.css | 1242 ---------------- theme/cloudy/base/css/facebookapp.css | 100 -- theme/cloudy/base/css/ie.css | 32 - theme/cloudy/base/css/ie6.css | 30 - theme/cloudy/base/css/jquery.Jcrop.css | 45 - theme/cloudy/base/css/mobile.css | 150 -- theme/cloudy/base/css/print.css | 36 - theme/cloudy/base/css/thickbox.css | 163 -- theme/cloudy/base/images/icons/icon_atom.png | Bin 820 -> 0 bytes theme/cloudy/base/images/icons/icon_foaf.gif | Bin 1144 -> 0 bytes theme/cloudy/base/images/icons/icon_processing.gif | Bin 673 -> 0 bytes theme/cloudy/base/images/icons/icon_rss.png | Bin 777 -> 0 bytes theme/cloudy/base/images/icons/icon_vcard.gif | Bin 331 -> 0 bytes .../base/images/illustrations/illu_jcrop.gif | Bin 329 -> 0 bytes .../illustrations/illu_progress_loading-01.gif | Bin 5886 -> 0 bytes theme/cloudy/css/display.css | 1550 ++++++++++++++++++++ theme/cloudy/css/ie.css | 34 + theme/cloudy/images/icons/icon_atom.png | Bin 0 -> 820 bytes theme/cloudy/images/icons/icon_disfavourite.gif | Bin 0 -> 701 bytes theme/cloudy/images/icons/icon_favourite.gif | Bin 0 -> 397 bytes theme/cloudy/images/icons/icon_foaf.gif | Bin 0 -> 1144 bytes theme/cloudy/images/icons/icon_processing.gif | Bin 0 -> 673 bytes theme/cloudy/images/icons/icon_reply.gif | Bin 0 -> 336 bytes theme/cloudy/images/icons/icon_rss.png | Bin 0 -> 777 bytes theme/cloudy/images/icons/icon_trash.gif | Bin 0 -> 148 bytes theme/cloudy/images/icons/icon_vcard.gif | Bin 0 -> 331 bytes .../images/icons/twotone/green/arrow-left.gif | Bin 0 -> 73 bytes .../images/icons/twotone/green/arrow-right.gif | Bin 0 -> 74 bytes theme/cloudy/images/icons/twotone/green/edit.gif | Bin 0 -> 75 bytes theme/cloudy/images/icons/twotone/green/mail.gif | Bin 0 -> 82 bytes theme/cloudy/images/icons/twotone/green/news.gif | Bin 0 -> 76 bytes theme/cloudy/images/icons/twotone/green/quote.gif | Bin 0 -> 79 bytes theme/cloudy/images/icons/twotone/green/shield.gif | Bin 0 -> 85 bytes .../images/illustrations/illu_arrow-up-01.gif | Bin 0 -> 68 bytes .../cloudy/images/illustrations/illu_clouds-01.gif | Bin 0 -> 14251 bytes theme/cloudy/images/illustrations/illu_jcrop.gif | Bin 0 -> 329 bytes .../illustrations/illu_progress_loading-01.gif | Bin 0 -> 5886 bytes .../images/illustrations/illu_unicorn-01.png | Bin 0 -> 5695 bytes theme/cloudy/skin/default/css/display.css | 314 ---- theme/cloudy/skin/default/css/ie.css | 34 - .../cloudy/skin/default/images/icons/icon_atom.jpg | Bin 1117 -> 0 bytes .../default/images/icons/icon_disfavourite.gif | Bin 701 -> 0 bytes .../skin/default/images/icons/icon_favourite.gif | Bin 397 -> 0 bytes .../cloudy/skin/default/images/icons/icon_foaf.gif | Bin 1144 -> 0 bytes .../skin/default/images/icons/icon_reply.gif | Bin 336 -> 0 bytes .../cloudy/skin/default/images/icons/icon_rss.jpg | Bin 1166 -> 0 bytes .../skin/default/images/icons/icon_trash.gif | Bin 148 -> 0 bytes .../skin/default/images/icons/icon_vcard.gif | Bin 331 -> 0 bytes .../images/icons/twotone/green/arrow-left.gif | Bin 73 -> 0 bytes .../images/icons/twotone/green/arrow-right.gif | Bin 74 -> 0 bytes .../default/images/icons/twotone/green/edit.gif | Bin 75 -> 0 bytes .../default/images/icons/twotone/green/mail.gif | Bin 82 -> 0 bytes .../default/images/icons/twotone/green/news.gif | Bin 76 -> 0 bytes .../default/images/icons/twotone/green/quote.gif | Bin 79 -> 0 bytes .../default/images/icons/twotone/green/shield.gif | Bin 85 -> 0 bytes .../images/illustrations/illu_arrow-up-01.gif | Bin 68 -> 0 bytes .../images/illustrations/illu_clouds-01.gif | Bin 14251 -> 0 bytes .../images/illustrations/illu_unicorn-01.png | Bin 5695 -> 0 bytes theme/default/base/css/display.css | 1177 --------------- theme/default/base/css/facebookapp.css | 100 -- theme/default/base/css/farbtastic.css | 32 - theme/default/base/css/ie.css | 32 - theme/default/base/css/ie6.css | 30 - theme/default/base/css/jquery.Jcrop.css | 45 - theme/default/base/css/mobile.css | 150 -- theme/default/base/css/print.css | 36 - theme/default/base/css/thickbox.css | 163 -- theme/default/base/images/icons/icon_atom.png | Bin 820 -> 0 bytes theme/default/base/images/icons/icon_foaf.gif | Bin 1144 -> 0 bytes .../default/base/images/icons/icon_processing.gif | Bin 673 -> 0 bytes theme/default/base/images/icons/icon_rss.png | Bin 777 -> 0 bytes theme/default/base/images/icons/icon_vcard.gif | Bin 331 -> 0 bytes .../base/images/illustrations/illu_jcrop.gif | Bin 329 -> 0 bytes .../illustrations/illu_progress_loading-01.gif | Bin 5886 -> 0 bytes theme/default/css/display.css | 250 ++++ theme/default/css/ie.css | 9 + theme/default/logo.png | Bin 4988 -> 0 bytes theme/default/skin/default/css/display.css | 248 ---- theme/default/skin/default/css/ie.css | 9 - .../skin/default/images/icons/icon_atom.jpg | Bin 1117 -> 0 bytes .../skin/default/images/icons/icon_foaf.gif | Bin 1144 -> 0 bytes .../default/skin/default/images/icons/icon_rss.jpg | Bin 1166 -> 0 bytes .../skin/default/images/icons/icon_vcard.gif | Bin 331 -> 0 bytes .../images/icons/twotone/green/arrow-left.gif | Bin 73 -> 0 bytes .../images/icons/twotone/green/arrow-right.gif | Bin 74 -> 0 bytes .../images/icons/twotone/green/disfavourite.gif | Bin 88 -> 0 bytes .../default/images/icons/twotone/green/edit.gif | Bin 75 -> 0 bytes .../images/icons/twotone/green/favourite.gif | Bin 73 -> 0 bytes .../default/images/icons/twotone/green/mail.gif | Bin 82 -> 0 bytes .../default/images/icons/twotone/green/news.gif | Bin 76 -> 0 bytes .../default/images/icons/twotone/green/quote.gif | Bin 79 -> 0 bytes .../default/images/icons/twotone/green/reply.gif | Bin 79 -> 0 bytes .../default/images/icons/twotone/green/shield.gif | Bin 85 -> 0 bytes .../default/images/icons/twotone/green/trash.gif | Bin 77 -> 0 bytes theme/default/skin/identica/css/display.css | 248 ---- theme/default/skin/identica/css/ie.css | 9 - .../skin/identica/images/icons/icon_atom.jpg | Bin 1117 -> 0 bytes .../skin/identica/images/icons/icon_foaf.gif | Bin 1144 -> 0 bytes .../skin/identica/images/icons/icon_rss.jpg | Bin 1166 -> 0 bytes .../skin/identica/images/icons/icon_vcard.gif | Bin 331 -> 0 bytes .../images/icons/twotone/green/arrow-left.gif | Bin 73 -> 0 bytes .../images/icons/twotone/green/arrow-right.gif | Bin 74 -> 0 bytes .../images/icons/twotone/green/disfavourite.gif | Bin 88 -> 0 bytes .../identica/images/icons/twotone/green/edit.gif | Bin 75 -> 0 bytes .../images/icons/twotone/green/favourite.gif | Bin 73 -> 0 bytes .../identica/images/icons/twotone/green/mail.gif | Bin 82 -> 0 bytes .../identica/images/icons/twotone/green/news.gif | Bin 76 -> 0 bytes .../identica/images/icons/twotone/green/quote.gif | Bin 79 -> 0 bytes .../identica/images/icons/twotone/green/reply.gif | Bin 79 -> 0 bytes .../identica/images/icons/twotone/green/shield.gif | Bin 85 -> 0 bytes .../identica/images/icons/twotone/green/trash.gif | Bin 77 -> 0 bytes theme/identica/css/display.css | 250 ++++ theme/identica/css/ie.css | 9 + theme/identica/default-avatar-mini.png | Bin 0 -> 646 bytes theme/identica/default-avatar-profile.png | Bin 0 -> 2853 bytes theme/identica/default-avatar-stream.png | Bin 0 -> 1487 bytes theme/identica/logo.png | Bin 0 -> 4988 bytes 148 files changed, 3874 insertions(+), 4436 deletions(-) create mode 100644 theme/base/css/display.css create mode 100644 theme/base/css/facebookapp.css create mode 100644 theme/base/css/farbtastic.css create mode 100644 theme/base/css/ie.css create mode 100644 theme/base/css/ie6.css create mode 100644 theme/base/css/jquery.Jcrop.css create mode 100644 theme/base/css/mobile.css create mode 100644 theme/base/css/print.css create mode 100644 theme/base/css/thickbox.css create mode 100644 theme/base/default-avatar-mini.png create mode 100644 theme/base/default-avatar-profile.png create mode 100644 theme/base/default-avatar-stream.png create mode 100644 theme/base/images/icons/icon_atom.png create mode 100644 theme/base/images/icons/icon_foaf.gif create mode 100644 theme/base/images/icons/icon_rss.png create mode 100644 theme/base/images/icons/icon_vcard.gif create mode 100644 theme/base/images/icons/twotone/green/arrow-left.gif create mode 100644 theme/base/images/icons/twotone/green/arrow-right.gif create mode 100644 theme/base/images/icons/twotone/green/disfavourite.gif create mode 100644 theme/base/images/icons/twotone/green/edit.gif create mode 100644 theme/base/images/icons/twotone/green/favourite.gif create mode 100644 theme/base/images/icons/twotone/green/mail.gif create mode 100644 theme/base/images/icons/twotone/green/news.gif create mode 100644 theme/base/images/icons/twotone/green/quote.gif create mode 100644 theme/base/images/icons/twotone/green/reply.gif create mode 100644 theme/base/images/icons/twotone/green/shield.gif create mode 100644 theme/base/images/icons/twotone/green/trash.gif create mode 100644 theme/base/images/illustrations/illu_jcrop.gif create mode 100644 theme/base/images/illustrations/illu_progress_loading-01.gif create mode 100644 theme/base/logo.png delete mode 100644 theme/cloudy/base/css/display.css delete mode 100644 theme/cloudy/base/css/facebookapp.css delete mode 100644 theme/cloudy/base/css/ie.css delete mode 100644 theme/cloudy/base/css/ie6.css delete mode 100644 theme/cloudy/base/css/jquery.Jcrop.css delete mode 100644 theme/cloudy/base/css/mobile.css delete mode 100644 theme/cloudy/base/css/print.css delete mode 100644 theme/cloudy/base/css/thickbox.css delete mode 100644 theme/cloudy/base/images/icons/icon_atom.png delete mode 100644 theme/cloudy/base/images/icons/icon_foaf.gif delete mode 100644 theme/cloudy/base/images/icons/icon_processing.gif delete mode 100644 theme/cloudy/base/images/icons/icon_rss.png delete mode 100644 theme/cloudy/base/images/icons/icon_vcard.gif delete mode 100644 theme/cloudy/base/images/illustrations/illu_jcrop.gif delete mode 100644 theme/cloudy/base/images/illustrations/illu_progress_loading-01.gif create mode 100644 theme/cloudy/css/display.css create mode 100644 theme/cloudy/css/ie.css create mode 100644 theme/cloudy/images/icons/icon_atom.png create mode 100644 theme/cloudy/images/icons/icon_disfavourite.gif create mode 100644 theme/cloudy/images/icons/icon_favourite.gif create mode 100644 theme/cloudy/images/icons/icon_foaf.gif create mode 100644 theme/cloudy/images/icons/icon_processing.gif create mode 100644 theme/cloudy/images/icons/icon_reply.gif create mode 100644 theme/cloudy/images/icons/icon_rss.png create mode 100644 theme/cloudy/images/icons/icon_trash.gif create mode 100644 theme/cloudy/images/icons/icon_vcard.gif create mode 100644 theme/cloudy/images/icons/twotone/green/arrow-left.gif create mode 100644 theme/cloudy/images/icons/twotone/green/arrow-right.gif create mode 100644 theme/cloudy/images/icons/twotone/green/edit.gif create mode 100644 theme/cloudy/images/icons/twotone/green/mail.gif create mode 100644 theme/cloudy/images/icons/twotone/green/news.gif create mode 100644 theme/cloudy/images/icons/twotone/green/quote.gif create mode 100644 theme/cloudy/images/icons/twotone/green/shield.gif create mode 100644 theme/cloudy/images/illustrations/illu_arrow-up-01.gif create mode 100644 theme/cloudy/images/illustrations/illu_clouds-01.gif create mode 100644 theme/cloudy/images/illustrations/illu_jcrop.gif create mode 100644 theme/cloudy/images/illustrations/illu_progress_loading-01.gif create mode 100644 theme/cloudy/images/illustrations/illu_unicorn-01.png delete mode 100644 theme/cloudy/skin/default/css/display.css delete mode 100644 theme/cloudy/skin/default/css/ie.css delete mode 100644 theme/cloudy/skin/default/images/icons/icon_atom.jpg delete mode 100644 theme/cloudy/skin/default/images/icons/icon_disfavourite.gif delete mode 100644 theme/cloudy/skin/default/images/icons/icon_favourite.gif delete mode 100644 theme/cloudy/skin/default/images/icons/icon_foaf.gif delete mode 100644 theme/cloudy/skin/default/images/icons/icon_reply.gif delete mode 100644 theme/cloudy/skin/default/images/icons/icon_rss.jpg delete mode 100644 theme/cloudy/skin/default/images/icons/icon_trash.gif delete mode 100644 theme/cloudy/skin/default/images/icons/icon_vcard.gif delete mode 100644 theme/cloudy/skin/default/images/icons/twotone/green/arrow-left.gif delete mode 100644 theme/cloudy/skin/default/images/icons/twotone/green/arrow-right.gif delete mode 100644 theme/cloudy/skin/default/images/icons/twotone/green/edit.gif delete mode 100644 theme/cloudy/skin/default/images/icons/twotone/green/mail.gif delete mode 100644 theme/cloudy/skin/default/images/icons/twotone/green/news.gif delete mode 100644 theme/cloudy/skin/default/images/icons/twotone/green/quote.gif delete mode 100644 theme/cloudy/skin/default/images/icons/twotone/green/shield.gif delete mode 100644 theme/cloudy/skin/default/images/illustrations/illu_arrow-up-01.gif delete mode 100644 theme/cloudy/skin/default/images/illustrations/illu_clouds-01.gif delete mode 100644 theme/cloudy/skin/default/images/illustrations/illu_unicorn-01.png delete mode 100644 theme/default/base/css/display.css delete mode 100644 theme/default/base/css/facebookapp.css delete mode 100644 theme/default/base/css/farbtastic.css delete mode 100644 theme/default/base/css/ie.css delete mode 100644 theme/default/base/css/ie6.css delete mode 100644 theme/default/base/css/jquery.Jcrop.css delete mode 100644 theme/default/base/css/mobile.css delete mode 100644 theme/default/base/css/print.css delete mode 100644 theme/default/base/css/thickbox.css delete mode 100644 theme/default/base/images/icons/icon_atom.png delete mode 100644 theme/default/base/images/icons/icon_foaf.gif delete mode 100644 theme/default/base/images/icons/icon_processing.gif delete mode 100644 theme/default/base/images/icons/icon_rss.png delete mode 100644 theme/default/base/images/icons/icon_vcard.gif delete mode 100644 theme/default/base/images/illustrations/illu_jcrop.gif delete mode 100644 theme/default/base/images/illustrations/illu_progress_loading-01.gif create mode 100644 theme/default/css/display.css create mode 100644 theme/default/css/ie.css delete mode 100644 theme/default/logo.png delete mode 100644 theme/default/skin/default/css/display.css delete mode 100644 theme/default/skin/default/css/ie.css delete mode 100644 theme/default/skin/default/images/icons/icon_atom.jpg delete mode 100644 theme/default/skin/default/images/icons/icon_foaf.gif delete mode 100644 theme/default/skin/default/images/icons/icon_rss.jpg delete mode 100644 theme/default/skin/default/images/icons/icon_vcard.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/arrow-left.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/arrow-right.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/disfavourite.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/edit.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/favourite.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/mail.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/news.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/quote.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/reply.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/shield.gif delete mode 100644 theme/default/skin/default/images/icons/twotone/green/trash.gif delete mode 100644 theme/default/skin/identica/css/display.css delete mode 100644 theme/default/skin/identica/css/ie.css delete mode 100644 theme/default/skin/identica/images/icons/icon_atom.jpg delete mode 100644 theme/default/skin/identica/images/icons/icon_foaf.gif delete mode 100644 theme/default/skin/identica/images/icons/icon_rss.jpg delete mode 100644 theme/default/skin/identica/images/icons/icon_vcard.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/arrow-left.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/arrow-right.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/disfavourite.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/edit.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/favourite.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/mail.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/news.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/quote.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/reply.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/shield.gif delete mode 100644 theme/default/skin/identica/images/icons/twotone/green/trash.gif create mode 100644 theme/identica/css/display.css create mode 100644 theme/identica/css/ie.css create mode 100644 theme/identica/default-avatar-mini.png create mode 100644 theme/identica/default-avatar-profile.png create mode 100644 theme/identica/default-avatar-stream.png create mode 100644 theme/identica/logo.png diff --git a/lib/action.php b/lib/action.php index 0a628bfdf..ff75ee855 100644 --- a/lib/action.php +++ b/lib/action.php @@ -194,37 +194,33 @@ class Action extends HTMLOutputter // lawsuit if (Event::handle('StartShowLaconicaStyles', array($this))) { $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', - 'href' => theme_path('base/css/display.css') . '?version=' . LACONICA_VERSION, - 'media' => 'screen, projection, tv')); - $this->element('link', array('rel' => 'stylesheet', - 'type' => 'text/css', - 'href' => skin_path('css/display.css') . '?version=' . LACONICA_VERSION, + 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, 'media' => 'screen, projection, tv')); if (common_config('site', 'mobile')) { $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', - 'href' => theme_path('base/css/mobile.css') . '?version=' . LACONICA_VERSION, + 'href' => theme_path('css/mobile.css', 'base') . '?version=' . LACONICA_VERSION, // TODO: "handheld" CSS for other mobile devices 'media' => 'only screen and (max-device-width: 480px)')); // Mobile WebKit } $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', - 'href' => theme_path('base/css/print.css') . '?version=' . LACONICA_VERSION, + 'href' => theme_path('css/print.css', 'base') . '?version=' . LACONICA_VERSION, 'media' => 'print')); Event::handle('EndShowLaconicaStyles', array($this)); } if (Event::handle('StartShowUAStyles', array($this))) { $this->comment('[if IE]>comment('[if lte IE '.$ver.']>comment('[if IE]> + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +* { margin:0; padding:0; } +img { display:block; border:0; } +a abbr { cursor: pointer; border-bottom:0; } +table { border-collapse:collapse; } +ol { list-style-position:inside; } +html { font-size: 87.5%; background-color:#fff; height:100%; } +body { +background-color:#fff; +color:#000; +font-family:sans-serif; +font-size:1em; +line-height:1.65; +position:relative; +} +h1,h2,h3,h4,h5,h6 { +margin-bottom:7px; +overflow:hidden; +} +h1 { +font-size:1.4em; +margin-bottom:18px; +} +#showstream h1 { display:none; } +h2 { font-size:1.3em; } +h3 { font-size:1.2em; } +h4 { font-size:1.1em; } +h5 { font-size:1em; } +h6 { font-size:0.9em; } + +caption { +font-weight:bold; +} +legend { +font-weight:bold; +font-size:1.3em; +} +input, textarea, select, option { +padding:4px; +font-family:sans-serif; +font-size:1em; +} +input, textarea, select { +border-width:2px; +border-style: solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + +input.submit { +font-weight:bold; +cursor:pointer; +} +textarea { +overflow:auto; +} +option { +padding-bottom:0; +} +fieldset { +padding:0; +border:0; +} +form ul li { +list-style-type:none; +margin:0 0 18px 0; +} +form label { +font-weight:bold; +} +input.checkbox { +position:relative; +top:2px; +left:0; +border:0; +} + +.error, +.success { +padding:4px 7px; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +margin-bottom:18px; +} +form label.submit { +display:none; +} + +.form_settings { +clear:both; +} + +.form_settings fieldset { +margin-bottom:29px; +} +.form_settings input.remove { +margin-left:11px; +} +.form_settings .form_data li { +width:100%; +float:left; +} +.form_settings .form_data label { +float:left; +} +.form_settings .form_data textarea, +.form_settings .form_data select, +.form_settings .form_data input { +margin-left:11px; +float:left; +} +.form_settings .form_data input.submit { +margin-left:0; +} + +.form_settings label { +margin-top:2px; +width:152px; +} + +.form_actions label { +display:none; +} +.form_guide { +font-style:italic; +} + +.form_settings #settings_autosubscribe label { +display:inline; +font-weight:bold; +} + +#form_settings_profile legend, +#form_login legend, +#form_register legend, +#form_password legend, +#form_settings_avatar legend, +#newgroup legend, +#editgroup legend, +#form_tag_user legend, +#form_remote_subscribe legend, +#form_openid_login legend, +#form_search legend, +#form_invite legend, +#form_notice_delete legend, +#form_password_recover legend, +#form_password_change legend { +display:none; +} + +.form_settings .form_data p.form_guide { +clear:both; +margin-left:163px; +margin-bottom:0; +} + +.form_settings p { +margin-bottom:11px; +} + +.form_settings input.checkbox { +margin-top:3px; +margin-left:0; +} +.form_settings label.checkbox { +font-weight:normal; +margin-top:0; +margin-right:0; +margin-left:11px; +float:left; +width:90%; +} + + +#form_login p.form_guide, +#form_register #settings_rememberme p.form_guide, +#form_openid_login #settings_rememberme p.form_guide, +#settings_twitter_remove p.form_guide, +#form_search ul.form_data #q { +margin-left:0; +} + +.form_settings .form_note { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +padding:0 7px; +} + + +.form_settings input.form_action-secondary { +margin-left:29px; +padding:0; +} + +#form_search .submit { +margin-left:11px; +} + +address { +float:left; +margin-bottom:18px; +margin-left:18px; +} +address.vcard img.logo { +margin-right:0; +} +address .fn { +font-weight:bold; +} +address img + .fn { +display:none; +} + +#header { +width:100%; +position:relative; +float:left; +padding-top:18px; +margin-bottom:29px; +} + +#site_nav_global_primary { +float:right; +margin-right:18px; +margin-bottom:11px; +margin-left:18px; +} +#site_nav_global_primary ul li { +display:inline; +margin-left:11px; +} + +.system_notice dt { +font-weight:bold; +text-transform:uppercase; +display:none; +} + +#site_notice { +position:absolute; +top:65px; +right:18px; +width:250px; +width:24%; +} +#page_notice { +clear:both; +margin-bottom:18px; +} + + +#anon_notice { +float:left; +width:43.2%; +padding:1.1%; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-width:2px; +border-style:solid; +line-height:1.5; +font-size:1.1em; +font-weight:bold; +} + + +#footer { +float:left; +width:64%; +padding:18px; +} + +#site_nav_local_views { +width:100%; +float:left; +} +#site_nav_local_views dt { +display:none; +} +#site_nav_local_views li { +float:left; +margin-right:18px; +list-style-type:none; +} +#site_nav_local_views a { +float:left; +text-decoration:none; +padding:4px 11px; +-moz-border-radius-topleft:4px; +-moz-border-radius-topright:4px; +-webkit-border-top-left-radius:4px; +-webkit-border-top-right-radius:4px; +border-width:1px; +border-style:solid; +border-bottom:0; +text-shadow: 2px 2px 2px #ddd; +font-weight:bold; +} +#site_nav_local_views .nav { +float:left; +width:100%; +} + +#site_nav_global_primary dt, +#site_nav_global_secondary dt { +display:none; +} + +#site_nav_global_secondary { +margin-bottom:11px; +} + +#site_nav_global_secondary ul li { +display:inline; +margin-right:11px; +} +#export_data li a { +padding-left:20px; +} +#export_data li a.foaf { +padding-left:30px; +} +#export_data li a.export_vcard { +padding-left:28px; +} + +#export_data ul { +display:inline; +} +#export_data li { +list-style-type:none; +display:inline; +margin-left:11px; +} +#export_data li:first-child { +margin-left:0; +} + +#licenses { +font-size:0.9em; +} + +#licenses dt { +font-weight:bold; +display:none; +} +#licenses dd { +margin-bottom:11px; +line-height:1.5; +} + +#site_content_license_cc { +margin-bottom:0; +} +#site_content_license_cc img { +display:inline; +vertical-align:top; +margin-right:4px; +} + +#wrap { +margin:0 auto; +width:100%; +min-width:760px; +max-width:1003px; +overflow:hidden; +} + +#core { +position:relative; +width:100%; +float:left; +margin-bottom:1em; +} + +#content { +width:64.009%; +min-height:259px; +padding:1.795%; +float:left; +border-radius:7px; +-moz-border-radius:7px; +-moz-border-radius-topleft:0; +-webkit-border-radius:7px; +-webkit-border-top-left-radius:0; +border-style:solid; +border-width:1px; +} + +#content_inner { +position:relative; +width:100%; +float:left; +} + +#aside_primary { +width:27.917%; +min-height:259px; +float:left; +margin-left:0.385%; +padding:1.795%; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-width:1px; +border-style:solid; +} + +#form_notice { +width:45.664%; +float:left; +position:relative; +line-height:1; +} +#form_notice fieldset { +border:0; +padding:0; +} +#form_notice legend { +display:none; +} +#form_notice textarea { +float:left; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +width:80.789%; +height:67px; +line-height:1.5; +padding:7px 7px 16px 7px; +} +#form_notice label { +display:block; +float:left; +font-size:1.3em; +margin-bottom:7px; +} +#form_notice #notice_submit label { +display:none; +} +#form_notice .form_note { +position:absolute; +top:99px; +right:98px; +z-index:9; +} +#form_notice .form_note dt { +font-weight:bold; +display:none; +} +#notice_text-count { +font-weight:bold; +line-height:1.15; +padding:1px 2px; +} +#form_notice #notice_action-submit { +width:14%; +height:47px; +padding:0; +position:absolute; +bottom:0; +right:0; +} +#form_notice label[for=to] { +margin-top:7px; +} +#form_notice select[id=to] { +margin-bottom:7px; +margin-left:18px; +float:left; +} + + +/* entity_profile */ +.entity_profile { +position:relative; +width:67.702%; +min-height:123px; +float:left; +margin-bottom:18px; +margin-left:0; +overflow:hidden; +} +.entity_profile dt, +#entity_statistics dt { +font-weight:bold; +} +.entity_profile dd { +display:inline; +} + +.entity_profile .entity_depiction { +float:left; +width:96px; +margin-right:18px; +margin-bottom:18px; +} + +.entity_profile .entity_fn, +.entity_profile .entity_nickname, +.entity_profile .entity_location, +.entity_profile .entity_url, +.entity_profile .entity_note, +.entity_profile .entity_tags { +margin-left:113px; +margin-bottom:4px; +} + +.entity_profile .entity_fn, +.entity_profile .entity_nickname { +margin-left:11px; +display:inline; +font-weight:bold; +} +.entity_profile .entity_nickname { +margin-left:0; +} + +.entity_profile .entity_fn dd:before { +content: "("; +font-weight:normal; +} +.entity_profile .entity_fn dd:after { +content: ")"; +font-weight:normal; +} + +.entity_profile dt { +display:none; +} +.entity_profile h2 { +display:none; +} +/* entity_profile */ + + +/*entity_actions*/ +.entity_actions { +float:right; +margin-left:4.35%; +max-width:25%; +} +.entity_actions h2 { +display:none; +} +.entity_actions ul { +list-style-type:none; +} +.entity_actions li { +margin-bottom:4px; +} +.entity_actions li:first-child { +border-top:0; +} +.entity_actions fieldset { +border:0; +padding:0; +} +.entity_actions legend { +display:none; +} + +.entity_actions input.submit { +display:block; +text-align:left; +width:100%; +} +.entity_actions a, +.entity_nudge p, +.entity_remote_subscribe { +text-decoration:none; +font-weight:bold; +display:block; +} + +.form_user_block input.submit, +.form_user_unblock input.submit, +.entity_send-a-message a, +.entity_edit a, +.form_user_nudge input.submit, +.entity_nudge p { +border:0; +padding-left:20px; +} + +.entity_edit a, +.entity_send-a-message a, +.entity_nudge p { +padding:4px 4px 4px 23px; +} + +.entity_remote_subscribe { +padding:4px; +border-width:2px; +border-style:solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} +.entity_actions .accept { +margin-bottom:18px; +} + +.entity_tags ul { +list-style-type:none; +display:inline; +} +.entity_tags li { +display:inline; +margin-right:4px; +} + +.aside .section { +margin-bottom:29px; +clear:both; +float:left; +width:100%; +} +.aside .section h2 { +text-transform:uppercase; +font-size:1em; +} + +#entity_statistics dt, +#entity_statistics dd { +display:inline; +} +#entity_statistics dt:after { +content: ":"; +} + +.section ul.entities { +float:left; +width:100%; +} +.section .entities li { +list-style-type:none; +float:left; +margin-right:7px; +margin-bottom:7px; +} +.section .entities li .photo { +margin-right:0; +margin-bottom:0; +} +.section .entities li .fn { +display:none; +} + +.aside .section p, +.aside .section .more { +clear:both; +} + +.profile .entity_profile { +margin-bottom:0; +min-height:60px; +} + + +.profile .form_group_join legend, +.profile .form_group_leave legend, +.profile .form_user_subscribe legend, +.profile .form_user_unsubscribe legend { +display:none; +} + +.profiles { +list-style-type:none; +} +.profile .entity_profile .entity_location { +width:auto; +clear:none; +margin-left:11px; +} +.profile .entity_profile dl, +.profile .entity_profile dd { +display:inline; +float:none; +} +.profile .entity_profile .entity_note, +.profile .entity_profile .entity_url, +.profile .entity_profile .entity_tags, +.profile .entity_profile .form_subscription_edit { +margin-left:59px; +clear:none; +display:block; +width:auto; +} +.profile .entity_profile .entity_tags dt { +display:inline; +margin-right:11px; +} + + +.profile .entity_profile .form_subscription_edit label { +font-weight:normal; +margin-right:11px; +} + + +/* NOTICE */ +.notice, +.profile { +position:relative; +padding-top:11px; +padding-bottom:11px; +clear:both; +float:left; +width:100%; +border-top-width:1px; +border-top-style:dotted; +} +.notices li { +list-style-type:none; +} +.notices li.hover { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + +/* NOTICES */ +#notices_primary { +float:left; +width:100%; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} +#notices_primary h2 { +display:none; +} +.notice-data a span { +display:block; +padding-left:28px; +} + +.notice .author { +margin-right:11px; +} + +.fn { +overflow:hidden; +} + +.notice .author .fn { +font-weight:bold; +} + +.notice .author .photo { +margin-bottom:0; +} + +.vcard .photo { +display:inline; +margin-right:11px; +margin-bottom:11px; +float:left; +} +.vcard .url { +text-decoration:none; +} +.vcard .url:hover { +text-decoration:underline; +} + +.notice .entry-title { +float:left; +width:100%; +overflow:hidden; +} +#shownotice .notice .entry-title { +font-size:2.2em; +} + +.notice p.entry-content { +display:inline; +} + +#content .notice p.entry-content a:visited { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} +.notice p.entry-content .vcard a { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + +.notice div.entry-content { +clear:left; +float:left; +font-size:0.95em; +margin-left:59px; +width:70%; +} +#showstream .notice div.entry-content { +margin-left:0; +} + +.notice .notice-options a, +.notice .notice-options input { +float:left; +font-size:1.025em; +} + +.notice div.entry-content dl, +.notice div.entry-content dt, +.notice div.entry-content dd { +display:inline; +} + +.notice div.entry-content .timestamp dt, +.notice div.entry-content .response dt { +display:none; +} +.notice div.entry-content .timestamp a { +display:inline-block; +} +.notice div.entry-content .device dt { +text-transform:lowercase; +} + + + +.notice-data { +position:absolute; +top:18px; +right:0; +min-height:50px; +margin-bottom:4px; +} +.notice .entry-content .notice-data dt { +display:none; +} + +.notice-data a { +display:block; +outline:none; +} + +.notice-options { +padding-left:2%; +float:left; +width:50%; +position:relative; +font-size:0.95em; +width:12.5%; +float:right; +} + +.notice-options a { +float:left; +} +.notice-options .notice_delete, +.notice-options .notice_reply, +.notice-options .form_favor, +.notice-options .form_disfavor { +position:absolute; +top:0; +} +.notice-options .form_favor, +.notice-options .form_disfavor { +left:0; +} +.notice-options .notice_reply { +left:29px; +} +.notice-options .notice_delete { +right:0; +} +.notice-options .notice_reply dt { +display:none; +} + +.notice-options input, +.notice-options a { +text-indent:-9999px; +outline:none; +} + +.notice-options .notice_reply a, +.notice-options input.submit { +display:block; +border:0; +} +.notice-options .notice_reply a, +.notice-options .notice_delete a { +text-decoration:none; +padding-left:16px; +} + +.notice-options form input.submit { +width:16px; +padding:2px 0; +} + +.notice-options .notice_delete dt, +.notice-options .form_favor legend, +.notice-options .form_disfavor legend { +display:none; +} +.notice-options .notice_delete fieldset, +.notice-options .form_favor fieldset, +.notice-options .form_disfavor fieldset { +border:0; +padding:0; +} + + +#usergroups #new_group { +float: left; +margin-right: 2em; +} +#new_group, #group_search { +margin-bottom:18px; +} +#new_group a { +padding-left:20px; +} + + +#filter_tags { +margin-bottom:11px; +float:left; +} +#filter_tags dt { +display:none; +} +#filter_tags ul { +list-style-type:none; +} +#filter_tags ul li { +float:left; +margin-left:7px; +padding-left:7px; +border-left-width:1px; +border-left-style:solid; +} +#filter_tags ul li.child_1 { +margin-left:0; +border-left:0; +padding-left:0; +} +#filter_tags ul li#filter_tags_all a { +font-weight:bold; +margin-top:7px; +float:left; +} + +#filter_tags ul li#filter_tags_item label { +margin-right:7px; +} +#filter_tags ul li#filter_tags_item label, +#filter_tags ul li#filter_tags_item select { +display:inline; +} +#filter_tags ul li#filter_tags_item p { +float:left; +margin-left:38px; +} +#filter_tags ul li#filter_tags_item input { +position:relative; +top:3px; +left:3px; +} + + + +.pagination { +float:left; +clear:both; +width:100%; +margin-top:18px; +} + +.pagination dt { +font-weight:bold; +display:none; +} + +.pagination .nav { +float:left; +width:100%; +list-style-type:none; +} + +.pagination .nav_prev { +float:left; +} +.pagination .nav_next { +float:right; +} + +.pagination a { +display:block; +text-decoration:none; +font-weight:bold; +padding:7px; +border-width:1px; +border-style:solid; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-radius:7px; +} + +.pagination .nav_prev a { +padding-left:30px; +} +.pagination .nav_next a { +padding-right:30px; +} +/* END: NOTICE */ + + +.hentry .entry-content p { +margin-bottom:18px; +} +.hentry entry-content ol, +.hentry .entry-content ul { +list-style-position:inside; +} +.hentry .entry-content li { +margin-bottom:18px; +} +.hentry .entry-content li li { +margin-left:18px; +} + + + + +/* TOP_POSTERS */ +.section tbody td { +padding-right:11px; +padding-bottom:11px; +} +.section .vcard .photo { +margin-right:7px; +margin-bottom:0; +} + +.section .notice { +padding-top:7px; +padding-bottom:7px; +border-top:0; +} + +.section .notice:first-child { +padding-top:0; +} + +.section .notice .author { +margin-right:0; +} +.section .notice .author .fn { +display:none; +} + + +/* tagcloud */ +.tag-cloud { +list-style-type:none; +text-align:center; +} +.aside .tag-cloud { +font-size:0.8em; +} +.tag-cloud li { +display:inline; +margin-right:7px; +line-height:1.25; +} +.aside .tag-cloud li { +line-height:1.5; +} +.tag-cloud li a { +text-decoration:none; +} +#tagcloud.section dt { +text-transform:uppercase; +font-weight:bold; +} +.tag-cloud-1 { +font-size:1em; +} +.tag-cloud-2 { +font-size:1.25em; +} +.tag-cloud-3 { +font-size:1.75em; +} +.tag-cloud-4 { +font-size:2em; +} +.tag-cloud-5 { +font-size:2.25em; +} +.tag-cloud-6 { +font-size:2.75em; +} +.tag-cloud-7 { +font-size:3.25em; +} + +#publictagcloud #tagcloud.section dt { +display:none; +} + +#form_settings_photo .form_data { +clear:both; +} + +#form_settings_avatar li { +width:auto; +} +#form_settings_avatar input { +margin-left:0; +} +#avatar_original, +#avatar_preview { +float:left; +} +#avatar_preview { +margin-left:29px; +} +#avatar_preview_view { +height:96px; +width:96px; +margin-bottom:18px; +overflow:hidden; +} + +#settings_attach, +#form_settings_avatar .form_actions { +clear:both; +} + +#form_settings_avatar .form_actions { +margin-bottom:0; +} + +#form_settings_design #settings_design_color .form_data, +#form_settings_design #color-picker { +float:left; +} +#form_settings_design #settings_design_color .form_data { +width:400px; +margin-right:28px; +} + +.instructions ul { +list-style-position:inside; +} +.instructions p, +.instructions ul { +margin-bottom:18px; +} +.help dt { +display:none; +} +.guide { +clear:both; +} diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css new file mode 100644 index 000000000..163b41fb4 --- /dev/null +++ b/theme/base/css/facebookapp.css @@ -0,0 +1,100 @@ +@import url("display.css"); +@import url("../../identica/css/display.css"); + +* { +font-size:14px; +font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; +} + +#wrap { +background-color:#F0F2F5; +padding-left:18px; +padding-right:18px; +width:auto; +} + +p,label, +h1,h2,h3,h4,h5,h6 { +color:#000; +} + +#content { +width:95%; +} + +#site_nav_local_views a { +background-color:#D0DFE7; +} +#site_nav_local_views a:hover { +background-color:#FAFBFC; +} + +span.facebook-button { +border: 2px solid #aaa; +padding: 3px; +display: block; +float: left; +margin-right: 20px; +-moz-border-radius: 4px; +border-radius:4px; +-webkit-border-radius:4px; +font-weight: bold; +background-color:#A9BF4F; +color:#fff; +font-size:1.2em +} + +span.facebook-button a { color:#fff } + +.facebook_guide { +margin-bottom:18px; +} +.facebook_guide p { +font-weight:bold; +} + + +input { +height:auto !important; +} + +#facebook-friends { +float:left; +width:100%; +} + +#facebook-friends li { +float:left; +margin-right:2%; +margin-bottom:11px; +width:18%; +height:115px; +} +#facebook-friends li a { +float:left; +} + +#add_to_profile { +position:absolute; +right:18px; +top:10px; +z-index:2; +} + +.notice div.entry-content dl, +.notice div.entry-content dt, +.notice div.entry-content dd { +margin-right:5px; +} + +#content_inner p { +margin-bottom:18px; +} + +#content_inner ul { +list-style-type:none; +} + +.form_settings label { +margin-right:18px; +} diff --git a/theme/base/css/farbtastic.css b/theme/base/css/farbtastic.css new file mode 100644 index 000000000..3b8fec58f --- /dev/null +++ b/theme/base/css/farbtastic.css @@ -0,0 +1,32 @@ +.farbtastic { + position: relative; +} +.farbtastic * { + position: absolute; + cursor: crosshair; +} +.farbtastic, .farbtastic .wheel { + width: 195px; + height: 195px; +} +.farbtastic .color, .farbtastic .overlay { + top: 47px; + left: 47px; + width: 101px; + height: 101px; +} +.farbtastic .wheel { + background: url(../../../../js/farbtastic/wheel.png) no-repeat; + width: 195px; + height: 195px; +} +.farbtastic .overlay { + background: url(../../../../js/farbtastic/mask.png) no-repeat; +} +.farbtastic .marker { + width: 17px; + height: 17px; + margin: -8px 0 0 -8px; + overflow: hidden; + background: url(../../../../js/farbtastic/marker.png) no-repeat; +} diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css new file mode 100644 index 000000000..5d8bea8ae --- /dev/null +++ b/theme/base/css/ie.css @@ -0,0 +1,32 @@ +/* IE specific styles */ +legend { +margin-left:-7px; +} +input.checkbox { +top:0; +} +#form_notice textarea { +width:78%; +} +#form_notice #notice_action-submit { +width:17%; +max-width:17%; +} +#anon_notice { +max-width:39%; +} + +.notice-options input.submit { +font-size:0; +margin-top:3px; +height:16px; +text-align:right; +text-indent:0; +width:24px; +} +.notice div.entry-content .timestamp a { +margin-right:4px; +} +.entity_profile { +width:64%; +} diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css new file mode 100644 index 000000000..76a82c004 --- /dev/null +++ b/theme/base/css/ie6.css @@ -0,0 +1,30 @@ +/* IE6 specific styles */ +address { +margin-left:7px; +} +address .fn { +display:none; +} +#content { +width:70%; +} +#aside_primary { +padding:5%; +width:29.5%; +} +.entity_profile .entity_nickname, +.entity_profile .entity_location, +.entity_profile .entity_url, +.entity_profile .entity_note, +.entity_profile .entity_tags { +margin-left:0; +} +.entity_profile .entity_depiction { +margin-bottom:123px; +} +.entity_actions { +width:20%; +} +.notice div.entry-content { +width:63%; +} diff --git a/theme/base/css/jquery.Jcrop.css b/theme/base/css/jquery.Jcrop.css new file mode 100644 index 000000000..6c6dfb503 --- /dev/null +++ b/theme/base/css/jquery.Jcrop.css @@ -0,0 +1,45 @@ +/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */ +.jcrop-holder +{ + text-align: left; +} + +.jcrop-vline, .jcrop-hline +{ + font-size: 0; + position: absolute; + background: #fff url(../images/illustrations/illu_jcrop.gif) top left repeat; + /* + opacity: .5; + *filter:alpha(opacity=50); + */ +} +.jcrop-vline { height: 100%; width: 1px !important; } +.jcrop-hline { width: 100%; height: 1px !important; } +.jcrop-handle { + font-size: 1px; + width: 7px !important; + height: 7px !important; + border: 1px #eee solid; + background-color: #333; + /*width: 9px; + height: 9px;*/ +} + +.jcrop-tracker { + /*background-color: gray;*/ + width: 100%; height: 100%; +} + +.custom .jcrop-vline, +.custom .jcrop-hline +{ + background: yellow; +} +.custom .jcrop-handle +{ + border-color: black; + background-color: #C7BB00; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; +} diff --git a/theme/base/css/mobile.css b/theme/base/css/mobile.css new file mode 100644 index 000000000..eee98317c --- /dev/null +++ b/theme/base/css/mobile.css @@ -0,0 +1,150 @@ +/** theme: base + * + * @package Laconica + * @author Meitar Moscovitz + * @author Sarven Capadisli + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +body { +font-size:2.5em; +} + +#wrap { +width:95%; +} + +#header, +#header address, +#anon_notice, +#site_nav_local_views .nav, +#form_notice, +#form_notice .form_data li, +#core, +#content_inner, +#notices_primary, +.notice, +.notice .entry-title, +.notice div.entry-content, +.notice-options, +.notice .notice-options a, +.pagination, +.pagination .nav, +.aside .section { +float:none; +} + +.notice-options .notice_reply, +.notice-options .notice_delete, +.notice-options .form_favor, +.notice-options .form_disfavor { +position:static; +} + +#form_notice, +#anon_notice, +#footer, +#form_notice .form_actions input.submit { +width:auto; +} + +.form_settings label { +width:25%; +} +.form_settings .form_data p.form_guide { +margin-left:26%; +} + +#site_nav_global_primary { +width:75%; +} + +.entity_profile { +width:65%; +} +.entity_actions { +margin-left:0; +} + +#form_notice, +#anon_notice { +clear:both; +} + +#content, +#aside_primary { +width:96%; +padding-left:2%; +padding-right:2%; +} + +#site_notice { +position:static; +float:right; +clear:right; +width:75%; +margin-right:0; +margin-bottom:11px; +} + +.notices { +font-size:1.5em; +} + +#form_notice textarea { +width:80%; +height:5em; +} +#form_notice .form_note { +right:20%; +top:6em; +} + + +.vcard .photo, +.section .vcard .photo { +margin-right:18px; +} +.notice, +.profile { +margin-bottom:18px; +} + +.notices .entry-title, +.notices div.entry-content { +width:90%; +} +.notice div.entry-content { +margin-left:0; +} + +.notice .author .photo { +height:4.5em; +width:4.5em; +} +.notice-options { +position:absolute; +top:0; +right:0; +padding-left:7%; +width:3%; +} + +.notice-options .notice_delete a { +float:left; +} +.pagination .nav { +overflow:auto; +} + +#export_data { +display:none; +} + +#site_nav_local_views li { +margin-right:4px; +} +#site_nav_local_views a { +padding:18px 11px; +} diff --git a/theme/base/css/print.css b/theme/base/css/print.css new file mode 100644 index 000000000..d76dd608c --- /dev/null +++ b/theme/base/css/print.css @@ -0,0 +1,36 @@ +/** theme: base + * + * @package Laconica + * @author Sarven Capadisli + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +a:after { background-color:#fff; } +a:not([href^="#"]):after { content:" ( "attr(href)" ) "; } + +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} + +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} + +.profiles li, +.notices li { +margin-bottom:18px; +} diff --git a/theme/base/css/thickbox.css b/theme/base/css/thickbox.css new file mode 100644 index 000000000..d24b9bedf --- /dev/null +++ b/theme/base/css/thickbox.css @@ -0,0 +1,163 @@ +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +*{padding: 0; margin: 0;} + +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +#TB_window { + font: 12px Arial, Helvetica, sans-serif; + color: #333333; +} + +#TB_secondLine { + font: 10px Arial, Helvetica, sans-serif; + color:#666666; +} + +#TB_window a:link {color: #666666;} +#TB_window a:visited {color: #666666;} +#TB_window a:hover {color: #000;} +#TB_window a:active {color: #666666;} +#TB_window a:focus{color: #666666;} + +/* ----------------------------------------------------------------------------------------------------------------*/ +/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ +/* ----------------------------------------------------------------------------------------------------------------*/ +#TB_overlay { + position: fixed; + z-index:100; + top: 0px; + left: 0px; + height:100%; + width:100%; +} + +.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} +.TB_overlayBG { + background-color:#000; + filter:alpha(opacity=75); + -moz-opacity: 0.75; + opacity: 0.75; +} + +* html #TB_overlay { /* ie6 hack */ + position: absolute; + height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); +} + +#TB_window { + position: fixed; + background: #ffffff; + z-index: 102; + color:#000000; + display:none; + border: 4px solid #525252; + text-align:left; + top:50%; + left:50%; +} + +* html #TB_window { /* ie6 hack */ +position: absolute; +margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); +} + +#TB_window img#TB_Image { + display:block; + margin: 15px 0 0 15px; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + border-top: 1px solid #666; + border-left: 1px solid #666; +} + +#TB_caption{ + height:25px; + padding:7px 30px 10px 25px; + float:left; +} + +#TB_closeWindow{ + height:25px; + padding:11px 25px 10px 0; + float:right; +} + +#TB_closeAjaxWindow{ + padding:7px 10px 5px 0; + margin-bottom:1px; + text-align:right; + float:right; +} + +#TB_ajaxWindowTitle{ + float:left; + padding:7px 0 5px 10px; + margin-bottom:1px; +} + +#TB_title{ + background-color:#e8e8e8; + height:27px; +} + +#TB_ajaxContent{ + clear:both; + padding:2px 15px 15px 15px; + overflow:auto; + text-align:left; + line-height:1.4em; +} + +#TB_ajaxContent.TB_modal{ + padding:15px; +} + +#TB_ajaxContent p{ + padding:5px 0px 5px 0px; +} + +#TB_load{ + position: fixed; + display:none; + height:13px; + width:208px; + z-index:103; + top: 50%; + left: 50%; + margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ +} + +* html #TB_load { /* ie6 hack */ +position: absolute; +margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); +} + +#TB_HideSelect{ + z-index:99; + position:fixed; + top: 0; + left: 0; + background-color:#fff; + border:none; + filter:alpha(opacity=0); + -moz-opacity: 0; + opacity: 0; + height:100%; + width:100%; +} + +* html #TB_HideSelect { /* ie6 hack */ + position: absolute; + height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); +} + +#TB_iframeContent{ + clear:both; + border:none; + margin-bottom:-1px; + margin-top:1px; + _margin-bottom:1px; +} diff --git a/theme/base/default-avatar-mini.png b/theme/base/default-avatar-mini.png new file mode 100644 index 000000000..38b8692b4 Binary files /dev/null and b/theme/base/default-avatar-mini.png differ diff --git a/theme/base/default-avatar-profile.png b/theme/base/default-avatar-profile.png new file mode 100644 index 000000000..f8357d4fc Binary files /dev/null and b/theme/base/default-avatar-profile.png differ diff --git a/theme/base/default-avatar-stream.png b/theme/base/default-avatar-stream.png new file mode 100644 index 000000000..6b63baa70 Binary files /dev/null and b/theme/base/default-avatar-stream.png differ diff --git a/theme/base/images/icons/icon_atom.png b/theme/base/images/icons/icon_atom.png new file mode 100644 index 000000000..6a001f11a Binary files /dev/null and b/theme/base/images/icons/icon_atom.png differ diff --git a/theme/base/images/icons/icon_foaf.gif b/theme/base/images/icons/icon_foaf.gif new file mode 100644 index 000000000..f8f784423 Binary files /dev/null and b/theme/base/images/icons/icon_foaf.gif differ diff --git a/theme/base/images/icons/icon_rss.png b/theme/base/images/icons/icon_rss.png new file mode 100644 index 000000000..0ccd1ce25 Binary files /dev/null and b/theme/base/images/icons/icon_rss.png differ diff --git a/theme/base/images/icons/icon_vcard.gif b/theme/base/images/icons/icon_vcard.gif new file mode 100644 index 000000000..6d52947f3 Binary files /dev/null and b/theme/base/images/icons/icon_vcard.gif differ diff --git a/theme/base/images/icons/twotone/green/arrow-left.gif b/theme/base/images/icons/twotone/green/arrow-left.gif new file mode 100644 index 000000000..afed19084 Binary files /dev/null and b/theme/base/images/icons/twotone/green/arrow-left.gif differ diff --git a/theme/base/images/icons/twotone/green/arrow-right.gif b/theme/base/images/icons/twotone/green/arrow-right.gif new file mode 100644 index 000000000..ee1707ed9 Binary files /dev/null and b/theme/base/images/icons/twotone/green/arrow-right.gif differ diff --git a/theme/base/images/icons/twotone/green/disfavourite.gif b/theme/base/images/icons/twotone/green/disfavourite.gif new file mode 100644 index 000000000..3946869ae Binary files /dev/null and b/theme/base/images/icons/twotone/green/disfavourite.gif differ diff --git a/theme/base/images/icons/twotone/green/edit.gif b/theme/base/images/icons/twotone/green/edit.gif new file mode 100644 index 000000000..c746aca60 Binary files /dev/null and b/theme/base/images/icons/twotone/green/edit.gif differ diff --git a/theme/base/images/icons/twotone/green/favourite.gif b/theme/base/images/icons/twotone/green/favourite.gif new file mode 100644 index 000000000..d93515e37 Binary files /dev/null and b/theme/base/images/icons/twotone/green/favourite.gif differ diff --git a/theme/base/images/icons/twotone/green/mail.gif b/theme/base/images/icons/twotone/green/mail.gif new file mode 100644 index 000000000..1084c862f Binary files /dev/null and b/theme/base/images/icons/twotone/green/mail.gif differ diff --git a/theme/base/images/icons/twotone/green/news.gif b/theme/base/images/icons/twotone/green/news.gif new file mode 100644 index 000000000..712c685dc Binary files /dev/null and b/theme/base/images/icons/twotone/green/news.gif differ diff --git a/theme/base/images/icons/twotone/green/quote.gif b/theme/base/images/icons/twotone/green/quote.gif new file mode 100644 index 000000000..4ba1f0c03 Binary files /dev/null and b/theme/base/images/icons/twotone/green/quote.gif differ diff --git a/theme/base/images/icons/twotone/green/reply.gif b/theme/base/images/icons/twotone/green/reply.gif new file mode 100644 index 000000000..6ff01bb35 Binary files /dev/null and b/theme/base/images/icons/twotone/green/reply.gif differ diff --git a/theme/base/images/icons/twotone/green/shield.gif b/theme/base/images/icons/twotone/green/shield.gif new file mode 100644 index 000000000..419d5ee4b Binary files /dev/null and b/theme/base/images/icons/twotone/green/shield.gif differ diff --git a/theme/base/images/icons/twotone/green/trash.gif b/theme/base/images/icons/twotone/green/trash.gif new file mode 100644 index 000000000..78dd64a3d Binary files /dev/null and b/theme/base/images/icons/twotone/green/trash.gif differ diff --git a/theme/base/images/illustrations/illu_jcrop.gif b/theme/base/images/illustrations/illu_jcrop.gif new file mode 100644 index 000000000..72ea7ccb5 Binary files /dev/null and b/theme/base/images/illustrations/illu_jcrop.gif differ diff --git a/theme/base/images/illustrations/illu_progress_loading-01.gif b/theme/base/images/illustrations/illu_progress_loading-01.gif new file mode 100644 index 000000000..82290f483 Binary files /dev/null and b/theme/base/images/illustrations/illu_progress_loading-01.gif differ diff --git a/theme/base/logo.png b/theme/base/logo.png new file mode 100644 index 000000000..7c68b34f6 Binary files /dev/null and b/theme/base/logo.png differ diff --git a/theme/cloudy/base/css/display.css b/theme/cloudy/base/css/display.css deleted file mode 100644 index c71a59ef2..000000000 --- a/theme/cloudy/base/css/display.css +++ /dev/null @@ -1,1242 +0,0 @@ -/** theme: cloudy - * - * @package Laconica - * @author Sarven Capadisli - * @copyright 2009 Control Yourself, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ - */ - -* { margin:0; padding:0; } -img { display:block; border:0; } -a abbr { cursor: pointer; border-bottom:0; } -table { border-collapse:collapse; } -ol { list-style-position:inside; } -html { font-size: 100%; background-color:#fff; height:100%; } -body { -background-color:#fff; -color:#000; -font-family:sans-serif; -font-size:0.75em; -line-height:normal; -position:relative; -height:100%; -} -h1,h2,h3,h4,h5,h6 { -margin-bottom:7px; -overflow:hidden; -} -h1 { -font-size:1.4em; -margin-bottom:18px; -} -#showstream h1 { display:none; } -h2 { font-size:1.3em; } -h3 { font-size:1.2em; } -h4 { font-size:1.1em; } -h5 { font-size:1em; } -h6 { font-size:0.9em; } - -caption { -font-weight:bold; -} -legend { -font-weight:bold; -font-size:1.3em; -} -input, textarea, select, option { -padding:4px; -font-family:sans-serif; -font-size:1em; -} -input, textarea, select { -border-width:2px; -border-style: solid; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} - -input.submit { -font-weight:bold; -cursor:pointer; -} -textarea { -overflow:auto; -} -option { -padding-bottom:0; -} -fieldset { -padding:0; -border:0; -} -form ul li { -list-style-type:none; -margin:0 0 18px 0; -} -form label { -font-weight:bold; -} -input.checkbox { -position:relative; -top:2px; -left:0; -border:0; -} - -.error, -.success { -padding:4px 7px; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -margin-bottom:18px; -} -form label.submit { -display:none; -} - -.form_settings { -clear:both; -} - -.form_settings fieldset { -margin-bottom:29px; -} -.form_settings input.remove { -margin-left:11px; -} -.form_settings .form_data li { -width:100%; -float:left; -} -.form_settings .form_data label { -float:left; -} -.form_settings .form_data textarea, -.form_settings .form_data select, -.form_settings .form_data input { -margin-left:11px; -float:left; -} -.form_settings .form_data input.submit { -margin-left:0; -} - -.form_settings label { -margin-top:2px; -width:145px; -} - -.form_actions label { -display:none; -} -.form_guide { -font-style:italic; -} - -.form_settings #settings_autosubscribe label { -display:inline; -font-weight:bold; -} - -#form_settings_profile legend, -#form_login legend, -#form_register legend, -#form_password legend, -#form_settings_avatar legend, -#newgroup legend, -#editgroup legend, -#form_tag_user legend, -#form_remote_subscribe legend, -#form_openid_login legend, -#form_search legend, -#form_invite legend, -#form_notice_delete legend, -#form_password_recover legend, -#form_password_change legend { -display:none; -} - -.form_settings .form_data p.form_guide { -clear:both; -margin-left:155px; -margin-bottom:0; -} - -.form_settings p { -margin-bottom:11px; -} - -.form_settings input.checkbox { -margin-top:0; -margin-left:0; -} -.form_settings label.checkbox { -font-weight:normal; -margin-top:0; -margin-right:0; -margin-left:11px; -float:left; -width:90%; -} - - -#form_login p.form_guide, -#form_register #settings_rememberme p.form_guide, -#form_openid_login #settings_rememberme p.form_guide, -#settings_twitter_remove p.form_guide, -#form_search ul.form_data #q { -margin-left:0; -} - -.form_settings .form_note { -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -padding:0 7px; -} - - -.form_settings input.form_action-secondary { -margin-left:29px; -padding:0; -} - -#form_search .submit { -margin-left:11px; -} - -address { -float:left; -margin-bottom:18px; -margin-left:18px; -} -address.vcard img.logo { -margin-right:0; -} -address .fn { -font-weight:bold; -} -address img + .fn { -display:none; -} - -#header { -width:100%; -position:relative; -float:left; -padding-top:18px; -margin-bottom:11px; -z-index:1; -} - -#site_nav_global_primary { -float:right; -margin-right:0; -margin-bottom:11px; -margin-left:18px; -padding-top:7px; -padding-bottom:7px; -padding-right:11px; --moz-border-radius:4px; -border-radius:4px; --webkit-border-radius:4px; -} -#site_nav_global_primary ul li { -display:inline; -margin-left:11px; -} -#site_nav_global_primary a { -text-decoration:none; -} - -.system_notice dt { -font-weight:bold; -text-transform:uppercase; -display:none; -} - -#site_notice { -position:absolute; -top:65px; -right:18px; -width:250px; -width:24%; -} -#page_notice { -clear:both; -margin-bottom:18px; -} - - -#anon_notice { -clear:both; -width:99.8%; -padding-top:36px; -line-height:1.5; -font-size:1.3em; -font-weight:bold; -} -#anon_notice p { -border-style:solid; -border-width:1px; -width:96%; -padding:2%; -} - -#footer { -float:left; -margin-bottom:1em; -padding:7px; --moz-border-radius:4px; -border-radius:4px; --webkit-border-radius:4px; -} -#footer a { -text-decoration:none; -} - -#site_nav_local_views { -width:203px; -float:right; -margin-right:0; --moz-border-radius-topright:4px; -border-radius-topright:4px; --webkit-border-top-right-radius:4px; -} -#site_nav_local_views dt { -display:none; -} -#site_nav_local_views li { -list-style-type:none; -padding:0; -border-width:1px; -border-style:solid; -border-top:0; -border-right:0; -} -#site_nav_local_views a { -text-decoration:none; -padding:13px; -border-width:1px; -border-style:solid; -border-bottom:0; -text-shadow: 2px 2px 2px #ddd; -font-weight:bold; -font-size:1em; -display:block; -} -#site_nav_local_views .nav { -float:left; -width:100%; -} - -#site_nav_global_primary dt, -#site_nav_global_secondary dt { -display:none; -} - -#site_nav_global_secondary { -margin-bottom:11px; -} - -#site_nav_global_secondary ul li { -display:inline; -margin-right:11px; -} -#export_data li a { -padding-left:20px; -} -#export_data li a.foaf { -padding-left:30px; -} -#export_data li a.export_vcard { -padding-left:28px; -} - -#export_data ul { -display:inline; -} -#export_data li { -list-style-type:none; -display:inline; -margin:0 18px 7px 0; -float:left; -} -#export_data li:first-child { -margin-left:0; -} - -#licenses { -font-size:0.9em; -} - -#licenses dt { -font-weight:bold; -display:none; -} -#licenses dd { -margin-bottom:11px; -line-height:1.5; -} - -#site_content_license_cc { -margin-bottom:0; -} -#site_content_license_cc img { -display:inline; -vertical-align:top; -margin-right:4px; -} - -#wrap { -margin:0 auto; -width: 763px; -min-width:760px; -max-width:1003px; -overflow:hidden; -} - -#core { -position:relative; -width:100%; -float:left; -margin-bottom:1em; -padding-top:10px; -} - -#content { -width:518px; -min-height:322px; -padding:20px; -float:left; -border-radius-topleft:4px; --moz-border-radius-topleft:4px; --webkit-border-top-left-radius:4px; -border-style:solid; -border-width:1px; -} - -#content_inner { -position:relative; -width:100%; -float:left; -} - -#aside_primary { -width:182px; -min-height:259px; -float:left; -margin-left:0; -padding:10px; -border-width:1px; -border-style:solid; -border-right:0; -border-top:0; -} - -#form_notice { -width:505px; -line-height:1; -position:absolute; -top:200px; -left:20px; -z-index:9; -} -#form_notice fieldset { -border:0; -padding:0 0 50px 0; -} -#form_notice legend { -display:none; -} -#form_notice textarea { -float:left; -width:505px; -height:45px; -line-height:1.5; -padding:5px; -border-width:1px; -} -#form_notice label { -display:block; -float:left; -font-size:1.3em; -margin-bottom:7px; -} -#form_notice #notice_submit label { -display:none; -} -#form_notice .form_note { -position:absolute; -top:-10px; -right:-10px; -z-index:9; -font-family:Georgia, serif; -font-size:1.7em; -} -#form_notice .form_note dt { -font-weight:bold; -display:none; -} -#notice_text-count { -font-weight:bold; -line-height:1.15; -padding:1px 2px; -} -#form_notice #notice_action-submit { -width:14%; -height:35px; -padding-top:0; -padding-bottom:0; -position:absolute; -bottom:10px; -right:-10px; -} -#form_notice label[for=to] { -margin-top:7px; -} -#form_notice select[id=to] { -margin-bottom:7px; -margin-left:18px; -float:left; -} - - -/* entity_profile */ -.entity_profile { -position:relative; -width:67.702%; -min-height:123px; -float:left; -margin-bottom:18px; -margin-left:0; -overflow:hidden; -} -.entity_profile dt, -#entity_statistics dt { -font-weight:bold; -} -.entity_profile dd { -display:inline; -} - -.entity_profile .entity_depiction { -float:left; -width:96px; -margin-right:18px; -margin-bottom:18px; -} - -.entity_profile .entity_fn, -.entity_profile .entity_nickname, -.entity_profile .entity_location, -.entity_profile .entity_url, -.entity_profile .entity_note, -.entity_profile .entity_tags { -margin-left:113px; -margin-bottom:4px; -} - -.entity_profile .entity_fn, -.entity_profile .entity_nickname { -margin-left:11px; -display:inline; -font-weight:bold; -} -.entity_profile .entity_nickname { -margin-left:0; -} - -.entity_profile .entity_fn dd:before { -content: "("; -font-weight:normal; -} -.entity_profile .entity_fn dd:after { -content: ")"; -font-weight:normal; -} - -.entity_profile dt { -display:none; -} -.entity_profile h2 { -display:none; -} -/* entity_profile */ - - -/*entity_actions*/ -.entity_actions { -float:right; -margin-left:4.35%; -max-width:25%; -} -.entity_actions h2 { -display:none; -} -.entity_actions ul { -list-style-type:none; -} -.entity_actions li { -margin-bottom:4px; -} -.entity_actions li:first-child { -border-top:0; -} -.entity_actions fieldset { -border:0; -padding:0; -} -.entity_actions legend { -display:none; -} - -.entity_actions input.submit { -display:block; -text-align:left; -width:100%; -} -.entity_actions a, -.entity_nudge p, -.entity_remote_subscribe { -text-decoration:none; -font-weight:bold; -display:block; -} - -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_send-a-message a, -.entity_edit a, -.form_user_nudge input.submit, -.entity_nudge p { -border:0; -padding-left:20px; -} - -.entity_edit a, -.entity_send-a-message a, -.entity_nudge p { -padding:4px 4px 4px 23px; -} - -.entity_remote_subscribe { -padding:4px; -border-width:2px; -border-style:solid; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} -.entity_actions .accept { -margin-bottom:18px; -} - -.entity_tags ul { -list-style-type:none; -display:inline; -} -.entity_tags li { -display:inline; -margin-right:4px; -} - -.aside .section { -margin-bottom:18px; -clear:both; -float:left; -width:100%; -} -.aside .section h2 { -font-size:110%; -text-transform:none; -} - -#entity_statistics dt, -#entity_statistics dd { -display:inline; -} -#entity_statistics dt:after { -content: ":"; -} - -.section ul.entities { -float:left; -width:100%; -} -.section .entities li { -list-style-type:none; -float:left; -margin-right:7px; -margin-bottom:7px; -} -.section .entities li .photo { -margin-right:0; -margin-bottom:0; -} -.section .entities li .fn { -display:none; -} - -.aside .section p, -.aside .section .more { -clear:both; -} - -.profile .entity_profile { -margin-bottom:0; -min-height:60px; -} - - -.profile .form_group_join legend, -.profile .form_group_leave legend, -.profile .form_user_subscribe legend, -.profile .form_user_unsubscribe legend { -display:none; -} - -.profiles { -list-style-type:none; -} -.profile .entity_profile .entity_location { -width:auto; -clear:none; -margin-left:11px; -} -.profile .entity_profile dl, -.profile .entity_profile dd { -display:inline; -float:none; -} -.profile .entity_profile .entity_note, -.profile .entity_profile .entity_url, -.profile .entity_profile .entity_tags, -.profile .entity_profile .form_subscription_edit { -margin-left:59px; -clear:none; -display:block; -width:auto; -} -.profile .entity_profile .entity_tags dt { -display:inline; -margin-right:11px; -} - - -.profile .entity_profile .form_subscription_edit label { -font-weight:normal; -margin-right:11px; -} - - -/* NOTICE */ -.notice, -.profile { -position:relative; -padding-top:11px; -padding-bottom:11px; -clear:both; -float:left; -width:100%; -border-top-width:1px; -border-top-style:dotted; -font-size:1.2em; -} -.notices li { -list-style-type:none; -line-height:1.1; -width:94%; -padding-right:5%; -padding-left:1%; -min-height:47px; -} - - -/* NOTICES */ -#notices_primary { -float:left; -width:100%; -border-radius:7px; --moz-border-radius:7px; --webkit-border-radius:7px; -} -#notices_primary h2 { -display:none; -} -.notice-data a span { -display:block; -padding-left:28px; -} - -.notice .author { -margin-right:11px; -} - -.fn { -overflow:hidden; -} - -.notice .author .fn { -font-weight:bold; -} - -.notice .author .photo { -margin-bottom:0; -} - -.vcard .photo { -display:inline; -margin-right:11px; -margin-bottom:11px; -float:left; -} -.vcard .url { -text-decoration:none; -} -.vcard .url:hover { -text-decoration:underline; -} - -.notice .entry-title { -float:none; -display:inline; -width:100%; -overflow:hidden; -} -#shownotice .notice .entry-title { -font-size:2.2em; -} - -.notice p.entry-content { -display:inline; -} - -.notice p.entry-content .vcard a { -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} - -.notice div.entry-content { -font-size:0.95em; -margin-left:59px; -margin-top:3px; -width:70%; -font-family:Georgia, serif; -font-style:italic; -font-size:0.8em; -display:block; -} -.notice div.entry-content a { -text-decoration:none; -} -.notice div.entry-content a:hover { -text-decoration:underline; -} -#showstream .notice div.entry-content { -margin-left:0; -} - -.notice .notice-options a, -.notice .notice-options input { -float:left; -font-size:1.025em; -} - -.notice div.entry-content dl, -.notice div.entry-content dt, -.notice div.entry-content dd { -display:inline; -} - -.notice div.entry-content .timestamp dt, -.notice div.entry-content .response dt { -display:none; -} -.notice div.entry-content .timestamp a { -display:inline-block; -} -.notice div.entry-content .device dt { -text-transform:lowercase; -} - - - -.notice-data { -position:absolute; -top:18px; -right:0; -min-height:50px; -margin-bottom:4px; -} -.notice .entry-content .notice-data dt { -display:none; -} - -.notice-data a { -display:block; -outline:none; -} - -.notice-options { -padding-left:2%; -float:left; -width:50%; -font-size:0.95em; -width:12.5%; -float:right; -display:none; -} -.notices li.hover div.notice-options { -display:block; -} - - -.notice-options a { -float:left; -} -.notice-options .notice_delete, -.notice-options .notice_reply, -.notice-options .form_favor, -.notice-options .form_disfavor { -position:absolute; -} -.notice-options .form_favor, -.notice-options .form_disfavor { -top:7px; -right:7px; -} -.notice-options .notice_reply { -top:30px; -right:7px; -} -.notice-options .notice_delete { -bottom:7px; -right:7px; -} -.notice-options .notice_reply dt { -display:none; -} - -.notice-options input, -.notice-options a { -text-indent:-9999px; -outline:none; -} - -.notice-options .notice_reply a, -.notice-options input.submit { -display:block; -border:0; -} -.notice-options .notice_reply a, -.notice-options .notice_delete a { -text-decoration:none; -padding-left:16px; -} - -.notice-options form input.submit { -width:16px; -padding:2px 0; -} - -.notice-options .notice_delete dt, -.notice-options .form_favor legend, -.notice-options .form_disfavor legend { -display:none; -} -.notice-options .notice_delete fieldset, -.notice-options .form_favor fieldset, -.notice-options .form_disfavor fieldset { -border:0; -padding:0; -} - - -#usergroups #new_group { -float: left; -margin-right: 2em; -} -#new_group, #group_search { -margin-bottom:18px; -} -#new_group a { -padding-left:20px; -} - - -#filter_tags { -margin-bottom:11px; -float:left; -} -#filter_tags dt { -display:none; -} -#filter_tags ul { -list-style-type:none; -} -#filter_tags ul li { -float:left; -margin-left:7px; -padding-left:7px; -border-left-width:1px; -border-left-style:solid; -} -#filter_tags ul li.child_1 { -margin-left:0; -border-left:0; -padding-left:0; -} -#filter_tags ul li#filter_tags_all a { -font-weight:bold; -margin-top:7px; -float:left; -} - -#filter_tags ul li#filter_tags_item label { -margin-right:7px; -} -#filter_tags ul li#filter_tags_item label, -#filter_tags ul li#filter_tags_item select { -display:inline; -} -#filter_tags ul li#filter_tags_item p { -float:left; -margin-left:38px; -} -#filter_tags ul li#filter_tags_item input { -position:relative; -top:3px; -left:3px; -} - - - -.pagination { -float:left; -clear:both; -width:100%; -margin-top:18px; -} - -.pagination dt { -font-weight:bold; -display:none; -} - -.pagination .nav { -float:left; -width:100%; -list-style-type:none; -} - -.pagination .nav_prev { -float:left; -} -.pagination .nav_next { -float:right; -} - -.pagination a { -display:block; -text-decoration:none; -font-weight:bold; -padding:7px; -border-width:1px; -border-style:solid; --moz-border-radius:7px; --webkit-border-radius:7px; -border-radius:7px; -} - -.pagination .nav_prev a { -padding-left:30px; -} -.pagination .nav_next a { -padding-right:30px; -} -/* END: NOTICE */ - - -.hentry .entry-content p { -margin-bottom:18px; -} -.hentry entry-content ol, -.hentry .entry-content ul { -list-style-position:inside; -} -.hentry .entry-content li { -margin-bottom:18px; -} -.hentry .entry-content li li { -margin-left:18px; -} - - - - -/* TOP_POSTERS */ -.section tbody td { -padding-right:11px; -padding-bottom:11px; -} -.section .vcard .photo { -margin-right:7px; -margin-bottom:0; -} - -.section .notice { -padding-top:7px; -padding-bottom:7px; -border-top:0; -} - -.section .notice:first-child { -padding-top:0; -} - -.section .notice .author { -margin-right:0; -} -.section .notice .author .fn { -display:none; -} - - -/* tagcloud */ -.tag-cloud { -list-style-type:none; -text-align:center; -} -.aside .tag-cloud { -font-size:0.8em; -} -.tag-cloud li { -display:inline; -margin-right:7px; -line-height:1.25; -} -.aside .tag-cloud li { -line-height:1.5; -} -.tag-cloud li a { -text-decoration:none; -} -#tagcloud.section dt { -text-transform:uppercase; -font-weight:bold; -} -.tag-cloud-1 { -font-size:1em; -} -.tag-cloud-2 { -font-size:1.25em; -} -.tag-cloud-3 { -font-size:1.75em; -} -.tag-cloud-4 { -font-size:2em; -} -.tag-cloud-5 { -font-size:2.25em; -} -.tag-cloud-6 { -font-size:2.75em; -} -.tag-cloud-7 { -font-size:3.25em; -} - -#publictagcloud #tagcloud.section dt { -display:none; -} - -#form_settings_photo .form_data { -clear:both; -} - -#form_settings_avatar li { -width:auto; -} -#form_settings_avatar input { -margin-left:0; -} -#avatar_original, -#avatar_preview { -float:left; -} -#avatar_preview { -margin-left:29px; -} -#avatar_preview_view { -height:96px; -width:96px; -margin-bottom:18px; -overflow:hidden; -} - -#settings_attach, -#form_settings_avatar .form_actions { -clear:both; -} - -#form_settings_avatar .form_actions { -margin-bottom:0; -} - -.instructions ul { -list-style-position:inside; -} -.instructions p, -.instructions ul { -margin-bottom:18px; -} -.help dt { -display:none; -} -.guide { -clear:both; -} - -#public.user_in #content, -#groups.user_in #content, -#publictagcloud.user_in #content, -#featured.user_in #content, -#favorited.user_in #content, -#all.user_in #content, -#replies.user_in #content, -#showstream.user_in #content, -#showfavorites.user_in #content, -#inbox.user_in #content, -#outbox.user_in #content, -#subscriptions.user_in #content, -#subscribers.user_in #content, -#showgroup.user_in #content { -padding-top:160px; -} - -#profilesettings #form_notice, -#avatarsettings #form_notice, -#passwordsettings #form_notice, -#emailsettings #form_notice, -#openidsettings #form_notice, -#othersettings #form_notice, -#smssettings #form_notice, -#twittersettings #form_notice, -#imsettings #form_notice, -#doc #form_notice, -#usergroups #form_notice, -#invite #form_notice, -#deletenotice #form_notice, -#newgroup #form_notice, -#register #form_notice, -#shownotice #form_notice, -#confirmaddress #form_notice, -#tag #form_notice { -display:none; -} diff --git a/theme/cloudy/base/css/facebookapp.css b/theme/cloudy/base/css/facebookapp.css deleted file mode 100644 index 163b41fb4..000000000 --- a/theme/cloudy/base/css/facebookapp.css +++ /dev/null @@ -1,100 +0,0 @@ -@import url("display.css"); -@import url("../../identica/css/display.css"); - -* { -font-size:14px; -font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; -} - -#wrap { -background-color:#F0F2F5; -padding-left:18px; -padding-right:18px; -width:auto; -} - -p,label, -h1,h2,h3,h4,h5,h6 { -color:#000; -} - -#content { -width:95%; -} - -#site_nav_local_views a { -background-color:#D0DFE7; -} -#site_nav_local_views a:hover { -background-color:#FAFBFC; -} - -span.facebook-button { -border: 2px solid #aaa; -padding: 3px; -display: block; -float: left; -margin-right: 20px; --moz-border-radius: 4px; -border-radius:4px; --webkit-border-radius:4px; -font-weight: bold; -background-color:#A9BF4F; -color:#fff; -font-size:1.2em -} - -span.facebook-button a { color:#fff } - -.facebook_guide { -margin-bottom:18px; -} -.facebook_guide p { -font-weight:bold; -} - - -input { -height:auto !important; -} - -#facebook-friends { -float:left; -width:100%; -} - -#facebook-friends li { -float:left; -margin-right:2%; -margin-bottom:11px; -width:18%; -height:115px; -} -#facebook-friends li a { -float:left; -} - -#add_to_profile { -position:absolute; -right:18px; -top:10px; -z-index:2; -} - -.notice div.entry-content dl, -.notice div.entry-content dt, -.notice div.entry-content dd { -margin-right:5px; -} - -#content_inner p { -margin-bottom:18px; -} - -#content_inner ul { -list-style-type:none; -} - -.form_settings label { -margin-right:18px; -} diff --git a/theme/cloudy/base/css/ie.css b/theme/cloudy/base/css/ie.css deleted file mode 100644 index 5d8bea8ae..000000000 --- a/theme/cloudy/base/css/ie.css +++ /dev/null @@ -1,32 +0,0 @@ -/* IE specific styles */ -legend { -margin-left:-7px; -} -input.checkbox { -top:0; -} -#form_notice textarea { -width:78%; -} -#form_notice #notice_action-submit { -width:17%; -max-width:17%; -} -#anon_notice { -max-width:39%; -} - -.notice-options input.submit { -font-size:0; -margin-top:3px; -height:16px; -text-align:right; -text-indent:0; -width:24px; -} -.notice div.entry-content .timestamp a { -margin-right:4px; -} -.entity_profile { -width:64%; -} diff --git a/theme/cloudy/base/css/ie6.css b/theme/cloudy/base/css/ie6.css deleted file mode 100644 index 76a82c004..000000000 --- a/theme/cloudy/base/css/ie6.css +++ /dev/null @@ -1,30 +0,0 @@ -/* IE6 specific styles */ -address { -margin-left:7px; -} -address .fn { -display:none; -} -#content { -width:70%; -} -#aside_primary { -padding:5%; -width:29.5%; -} -.entity_profile .entity_nickname, -.entity_profile .entity_location, -.entity_profile .entity_url, -.entity_profile .entity_note, -.entity_profile .entity_tags { -margin-left:0; -} -.entity_profile .entity_depiction { -margin-bottom:123px; -} -.entity_actions { -width:20%; -} -.notice div.entry-content { -width:63%; -} diff --git a/theme/cloudy/base/css/jquery.Jcrop.css b/theme/cloudy/base/css/jquery.Jcrop.css deleted file mode 100644 index 6c6dfb503..000000000 --- a/theme/cloudy/base/css/jquery.Jcrop.css +++ /dev/null @@ -1,45 +0,0 @@ -/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */ -.jcrop-holder -{ - text-align: left; -} - -.jcrop-vline, .jcrop-hline -{ - font-size: 0; - position: absolute; - background: #fff url(../images/illustrations/illu_jcrop.gif) top left repeat; - /* - opacity: .5; - *filter:alpha(opacity=50); - */ -} -.jcrop-vline { height: 100%; width: 1px !important; } -.jcrop-hline { width: 100%; height: 1px !important; } -.jcrop-handle { - font-size: 1px; - width: 7px !important; - height: 7px !important; - border: 1px #eee solid; - background-color: #333; - /*width: 9px; - height: 9px;*/ -} - -.jcrop-tracker { - /*background-color: gray;*/ - width: 100%; height: 100%; -} - -.custom .jcrop-vline, -.custom .jcrop-hline -{ - background: yellow; -} -.custom .jcrop-handle -{ - border-color: black; - background-color: #C7BB00; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; -} diff --git a/theme/cloudy/base/css/mobile.css b/theme/cloudy/base/css/mobile.css deleted file mode 100644 index eee98317c..000000000 --- a/theme/cloudy/base/css/mobile.css +++ /dev/null @@ -1,150 +0,0 @@ -/** theme: base - * - * @package Laconica - * @author Meitar Moscovitz - * @author Sarven Capadisli - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ - */ - -body { -font-size:2.5em; -} - -#wrap { -width:95%; -} - -#header, -#header address, -#anon_notice, -#site_nav_local_views .nav, -#form_notice, -#form_notice .form_data li, -#core, -#content_inner, -#notices_primary, -.notice, -.notice .entry-title, -.notice div.entry-content, -.notice-options, -.notice .notice-options a, -.pagination, -.pagination .nav, -.aside .section { -float:none; -} - -.notice-options .notice_reply, -.notice-options .notice_delete, -.notice-options .form_favor, -.notice-options .form_disfavor { -position:static; -} - -#form_notice, -#anon_notice, -#footer, -#form_notice .form_actions input.submit { -width:auto; -} - -.form_settings label { -width:25%; -} -.form_settings .form_data p.form_guide { -margin-left:26%; -} - -#site_nav_global_primary { -width:75%; -} - -.entity_profile { -width:65%; -} -.entity_actions { -margin-left:0; -} - -#form_notice, -#anon_notice { -clear:both; -} - -#content, -#aside_primary { -width:96%; -padding-left:2%; -padding-right:2%; -} - -#site_notice { -position:static; -float:right; -clear:right; -width:75%; -margin-right:0; -margin-bottom:11px; -} - -.notices { -font-size:1.5em; -} - -#form_notice textarea { -width:80%; -height:5em; -} -#form_notice .form_note { -right:20%; -top:6em; -} - - -.vcard .photo, -.section .vcard .photo { -margin-right:18px; -} -.notice, -.profile { -margin-bottom:18px; -} - -.notices .entry-title, -.notices div.entry-content { -width:90%; -} -.notice div.entry-content { -margin-left:0; -} - -.notice .author .photo { -height:4.5em; -width:4.5em; -} -.notice-options { -position:absolute; -top:0; -right:0; -padding-left:7%; -width:3%; -} - -.notice-options .notice_delete a { -float:left; -} -.pagination .nav { -overflow:auto; -} - -#export_data { -display:none; -} - -#site_nav_local_views li { -margin-right:4px; -} -#site_nav_local_views a { -padding:18px 11px; -} diff --git a/theme/cloudy/base/css/print.css b/theme/cloudy/base/css/print.css deleted file mode 100644 index d76dd608c..000000000 --- a/theme/cloudy/base/css/print.css +++ /dev/null @@ -1,36 +0,0 @@ -/** theme: base - * - * @package Laconica - * @author Sarven Capadisli - * @copyright 2009 Control Yourself, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ - */ - -a:after { background-color:#fff; } -a:not([href^="#"]):after { content:" ( "attr(href)" ) "; } - -img { border:none; } -p { orphans: 2; widows: 1; } - -#site_nav_global_primary, -#site_nav_local_views, -#form_notice, -.pagination, -#site_nav_global_secondary, -.entity_actions, -.notice-options, -#aside_primary, -.form_subscription_edit .submit { -display:none; -} - -.timestamp dt, .timestamp dd, -.device dt, .device dd { -display:inline; -} - -.profiles li, -.notices li { -margin-bottom:18px; -} diff --git a/theme/cloudy/base/css/thickbox.css b/theme/cloudy/base/css/thickbox.css deleted file mode 100644 index d24b9bedf..000000000 --- a/theme/cloudy/base/css/thickbox.css +++ /dev/null @@ -1,163 +0,0 @@ -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -*{padding: 0; margin: 0;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_window { - font: 12px Arial, Helvetica, sans-serif; - color: #333333; -} - -#TB_secondLine { - font: 10px Arial, Helvetica, sans-serif; - color:#666666; -} - -#TB_window a:link {color: #666666;} -#TB_window a:visited {color: #666666;} -#TB_window a:hover {color: #000;} -#TB_window a:active {color: #666666;} -#TB_window a:focus{color: #666666;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_overlay { - position: fixed; - z-index:100; - top: 0px; - left: 0px; - height:100%; - width:100%; -} - -.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} -.TB_overlayBG { - background-color:#000; - filter:alpha(opacity=75); - -moz-opacity: 0.75; - opacity: 0.75; -} - -* html #TB_overlay { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_window { - position: fixed; - background: #ffffff; - z-index: 102; - color:#000000; - display:none; - border: 4px solid #525252; - text-align:left; - top:50%; - left:50%; -} - -* html #TB_window { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_window img#TB_Image { - display:block; - margin: 15px 0 0 15px; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - border-top: 1px solid #666; - border-left: 1px solid #666; -} - -#TB_caption{ - height:25px; - padding:7px 30px 10px 25px; - float:left; -} - -#TB_closeWindow{ - height:25px; - padding:11px 25px 10px 0; - float:right; -} - -#TB_closeAjaxWindow{ - padding:7px 10px 5px 0; - margin-bottom:1px; - text-align:right; - float:right; -} - -#TB_ajaxWindowTitle{ - float:left; - padding:7px 0 5px 10px; - margin-bottom:1px; -} - -#TB_title{ - background-color:#e8e8e8; - height:27px; -} - -#TB_ajaxContent{ - clear:both; - padding:2px 15px 15px 15px; - overflow:auto; - text-align:left; - line-height:1.4em; -} - -#TB_ajaxContent.TB_modal{ - padding:15px; -} - -#TB_ajaxContent p{ - padding:5px 0px 5px 0px; -} - -#TB_load{ - position: fixed; - display:none; - height:13px; - width:208px; - z-index:103; - top: 50%; - left: 50%; - margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ -} - -* html #TB_load { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_HideSelect{ - z-index:99; - position:fixed; - top: 0; - left: 0; - background-color:#fff; - border:none; - filter:alpha(opacity=0); - -moz-opacity: 0; - opacity: 0; - height:100%; - width:100%; -} - -* html #TB_HideSelect { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_iframeContent{ - clear:both; - border:none; - margin-bottom:-1px; - margin-top:1px; - _margin-bottom:1px; -} diff --git a/theme/cloudy/base/images/icons/icon_atom.png b/theme/cloudy/base/images/icons/icon_atom.png deleted file mode 100644 index 6a001f11a..000000000 Binary files a/theme/cloudy/base/images/icons/icon_atom.png and /dev/null differ diff --git a/theme/cloudy/base/images/icons/icon_foaf.gif b/theme/cloudy/base/images/icons/icon_foaf.gif deleted file mode 100644 index f8f784423..000000000 Binary files a/theme/cloudy/base/images/icons/icon_foaf.gif and /dev/null differ diff --git a/theme/cloudy/base/images/icons/icon_processing.gif b/theme/cloudy/base/images/icons/icon_processing.gif deleted file mode 100644 index d0bce1542..000000000 Binary files a/theme/cloudy/base/images/icons/icon_processing.gif and /dev/null differ diff --git a/theme/cloudy/base/images/icons/icon_rss.png b/theme/cloudy/base/images/icons/icon_rss.png deleted file mode 100644 index 0ccd1ce25..000000000 Binary files a/theme/cloudy/base/images/icons/icon_rss.png and /dev/null differ diff --git a/theme/cloudy/base/images/icons/icon_vcard.gif b/theme/cloudy/base/images/icons/icon_vcard.gif deleted file mode 100644 index 6d52947f3..000000000 Binary files a/theme/cloudy/base/images/icons/icon_vcard.gif and /dev/null differ diff --git a/theme/cloudy/base/images/illustrations/illu_jcrop.gif b/theme/cloudy/base/images/illustrations/illu_jcrop.gif deleted file mode 100644 index 72ea7ccb5..000000000 Binary files a/theme/cloudy/base/images/illustrations/illu_jcrop.gif and /dev/null differ diff --git a/theme/cloudy/base/images/illustrations/illu_progress_loading-01.gif b/theme/cloudy/base/images/illustrations/illu_progress_loading-01.gif deleted file mode 100644 index 82290f483..000000000 Binary files a/theme/cloudy/base/images/illustrations/illu_progress_loading-01.gif and /dev/null differ diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css new file mode 100644 index 000000000..151758b48 --- /dev/null +++ b/theme/cloudy/css/display.css @@ -0,0 +1,1550 @@ +/** theme: cloudy + * + * @package Laconica + * @author Sarven Capadisli + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +* { margin:0; padding:0; } +img { display:block; border:0; } +a abbr { cursor: pointer; border-bottom:0; } +table { border-collapse:collapse; } +ol { list-style-position:inside; } +html { font-size: 100%; background-color:#fff; height:100%; } +body { +background-color:#fff; +color:#000; +font-family:sans-serif; +font-size:0.75em; +line-height:normal; +position:relative; +height:100%; +} +h1,h2,h3,h4,h5,h6 { +margin-bottom:7px; +overflow:hidden; +} +h1 { +font-size:1.4em; +margin-bottom:18px; +} +#showstream h1 { display:none; } +h2 { font-size:1.3em; } +h3 { font-size:1.2em; } +h4 { font-size:1.1em; } +h5 { font-size:1em; } +h6 { font-size:0.9em; } + +caption { +font-weight:bold; +} +legend { +font-weight:bold; +font-size:1.3em; +} +input, textarea, select, option { +padding:4px; +font-family:sans-serif; +font-size:1em; +} +input, textarea, select { +border-width:2px; +border-style: solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + +input.submit { +font-weight:bold; +cursor:pointer; +} +textarea { +overflow:auto; +} +option { +padding-bottom:0; +} +fieldset { +padding:0; +border:0; +} +form ul li { +list-style-type:none; +margin:0 0 18px 0; +} +form label { +font-weight:bold; +} +input.checkbox { +position:relative; +top:2px; +left:0; +border:0; +} + +.error, +.success { +padding:4px 7px; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +margin-bottom:18px; +} +form label.submit { +display:none; +} + +.form_settings { +clear:both; +} + +.form_settings fieldset { +margin-bottom:29px; +} +.form_settings input.remove { +margin-left:11px; +} +.form_settings .form_data li { +width:100%; +float:left; +} +.form_settings .form_data label { +float:left; +} +.form_settings .form_data textarea, +.form_settings .form_data select, +.form_settings .form_data input { +margin-left:11px; +float:left; +} +.form_settings .form_data input.submit { +margin-left:0; +} + +.form_settings label { +margin-top:2px; +width:145px; +} + +.form_actions label { +display:none; +} +.form_guide { +font-style:italic; +} + +.form_settings #settings_autosubscribe label { +display:inline; +font-weight:bold; +} + +#form_settings_profile legend, +#form_login legend, +#form_register legend, +#form_password legend, +#form_settings_avatar legend, +#newgroup legend, +#editgroup legend, +#form_tag_user legend, +#form_remote_subscribe legend, +#form_openid_login legend, +#form_search legend, +#form_invite legend, +#form_notice_delete legend, +#form_password_recover legend, +#form_password_change legend { +display:none; +} + +.form_settings .form_data p.form_guide { +clear:both; +margin-left:155px; +margin-bottom:0; +} + +.form_settings p { +margin-bottom:11px; +} + +.form_settings input.checkbox { +margin-top:0; +margin-left:0; +} +.form_settings label.checkbox { +font-weight:normal; +margin-top:0; +margin-right:0; +margin-left:11px; +float:left; +width:90%; +} + + +#form_login p.form_guide, +#form_register #settings_rememberme p.form_guide, +#form_openid_login #settings_rememberme p.form_guide, +#settings_twitter_remove p.form_guide, +#form_search ul.form_data #q { +margin-left:0; +} + +.form_settings .form_note { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +padding:0 7px; +} + + +.form_settings input.form_action-secondary { +margin-left:29px; +padding:0; +} + +#form_search .submit { +margin-left:11px; +} + +address { +float:left; +margin-bottom:18px; +margin-left:18px; +} +address.vcard img.logo { +margin-right:0; +} +address .fn { +font-weight:bold; +} +address img + .fn { +display:none; +} + +#header { +width:100%; +position:relative; +float:left; +padding-top:18px; +margin-bottom:11px; +z-index:1; +} + +#site_nav_global_primary { +float:right; +margin-right:0; +margin-bottom:11px; +margin-left:18px; +padding-top:7px; +padding-bottom:7px; +padding-right:11px; +-moz-border-radius:4px; +border-radius:4px; +-webkit-border-radius:4px; +} +#site_nav_global_primary ul li { +display:inline; +margin-left:11px; +} +#site_nav_global_primary a { +text-decoration:none; +} + +.system_notice dt { +font-weight:bold; +text-transform:uppercase; +display:none; +} + +#site_notice { +position:absolute; +top:65px; +right:18px; +width:250px; +width:24%; +} +#page_notice { +clear:both; +margin-bottom:18px; +} + + +#anon_notice { +clear:both; +width:99.8%; +padding-top:36px; +line-height:1.5; +font-size:1.3em; +font-weight:bold; +} +#anon_notice p { +border-style:solid; +border-width:1px; +width:96%; +padding:2%; +} + +#footer { +float:left; +margin-bottom:1em; +padding:7px; +-moz-border-radius:4px; +border-radius:4px; +-webkit-border-radius:4px; +} +#footer a { +text-decoration:none; +} + +#site_nav_local_views { +width:203px; +float:right; +margin-right:0; +-moz-border-radius-topright:4px; +border-radius-topright:4px; +-webkit-border-top-right-radius:4px; +} +#site_nav_local_views dt { +display:none; +} +#site_nav_local_views li { +list-style-type:none; +padding:0; +border-width:1px; +border-style:solid; +border-top:0; +border-right:0; +} +#site_nav_local_views a { +text-decoration:none; +padding:13px; +border-width:1px; +border-style:solid; +border-bottom:0; +text-shadow: 2px 2px 2px #ddd; +font-weight:bold; +font-size:1em; +display:block; +} +#site_nav_local_views .nav { +float:left; +width:100%; +} + +#site_nav_global_primary dt, +#site_nav_global_secondary dt { +display:none; +} + +#site_nav_global_secondary { +margin-bottom:11px; +} + +#site_nav_global_secondary ul li { +display:inline; +margin-right:11px; +} +#export_data li a { +padding-left:20px; +} +#export_data li a.foaf { +padding-left:30px; +} +#export_data li a.export_vcard { +padding-left:28px; +} + +#export_data ul { +display:inline; +} +#export_data li { +list-style-type:none; +display:inline; +margin:0 18px 7px 0; +float:left; +} +#export_data li:first-child { +margin-left:0; +} + +#licenses { +font-size:0.9em; +} + +#licenses dt { +font-weight:bold; +display:none; +} +#licenses dd { +margin-bottom:11px; +line-height:1.5; +} + +#site_content_license_cc { +margin-bottom:0; +} +#site_content_license_cc img { +display:inline; +vertical-align:top; +margin-right:4px; +} + +#wrap { +margin:0 auto; +width: 763px; +min-width:760px; +max-width:1003px; +overflow:hidden; +} + +#core { +position:relative; +width:100%; +float:left; +margin-bottom:1em; +padding-top:10px; +} + +#content { +width:518px; +min-height:322px; +padding:20px; +float:left; +border-radius-topleft:4px; +-moz-border-radius-topleft:4px; +-webkit-border-top-left-radius:4px; +border-style:solid; +border-width:1px; +} + +#content_inner { +position:relative; +width:100%; +float:left; +} + +#aside_primary { +width:182px; +min-height:259px; +float:left; +margin-left:0; +padding:10px; +border-width:1px; +border-style:solid; +border-right:0; +border-top:0; +} + +#form_notice { +width:505px; +line-height:1; +position:absolute; +top:200px; +left:20px; +z-index:9; +} +#form_notice fieldset { +border:0; +padding:0 0 50px 0; +} +#form_notice legend { +display:none; +} +#form_notice textarea { +float:left; +width:505px; +height:45px; +line-height:1.5; +padding:5px; +border-width:1px; +} +#form_notice label { +display:block; +float:left; +font-size:1.3em; +margin-bottom:7px; +} +#form_notice #notice_submit label { +display:none; +} +#form_notice .form_note { +position:absolute; +top:-10px; +right:-10px; +z-index:9; +font-family:Georgia, serif; +font-size:1.7em; +} +#form_notice .form_note dt { +font-weight:bold; +display:none; +} +#notice_text-count { +font-weight:bold; +line-height:1.15; +padding:1px 2px; +} +#form_notice #notice_action-submit { +width:14%; +height:35px; +padding-top:0; +padding-bottom:0; +position:absolute; +bottom:10px; +right:-10px; +} +#form_notice label[for=to] { +margin-top:7px; +} +#form_notice select[id=to] { +margin-bottom:7px; +margin-left:18px; +float:left; +} + + +/* entity_profile */ +.entity_profile { +position:relative; +width:67.702%; +min-height:123px; +float:left; +margin-bottom:18px; +margin-left:0; +overflow:hidden; +} +.entity_profile dt, +#entity_statistics dt { +font-weight:bold; +} +.entity_profile dd { +display:inline; +} + +.entity_profile .entity_depiction { +float:left; +width:96px; +margin-right:18px; +margin-bottom:18px; +} + +.entity_profile .entity_fn, +.entity_profile .entity_nickname, +.entity_profile .entity_location, +.entity_profile .entity_url, +.entity_profile .entity_note, +.entity_profile .entity_tags { +margin-left:113px; +margin-bottom:4px; +} + +.entity_profile .entity_fn, +.entity_profile .entity_nickname { +margin-left:11px; +display:inline; +font-weight:bold; +} +.entity_profile .entity_nickname { +margin-left:0; +} + +.entity_profile .entity_fn dd:before { +content: "("; +font-weight:normal; +} +.entity_profile .entity_fn dd:after { +content: ")"; +font-weight:normal; +} + +.entity_profile dt { +display:none; +} +.entity_profile h2 { +display:none; +} +/* entity_profile */ + + +/*entity_actions*/ +.entity_actions { +float:right; +margin-left:4.35%; +max-width:25%; +} +.entity_actions h2 { +display:none; +} +.entity_actions ul { +list-style-type:none; +} +.entity_actions li { +margin-bottom:4px; +} +.entity_actions li:first-child { +border-top:0; +} +.entity_actions fieldset { +border:0; +padding:0; +} +.entity_actions legend { +display:none; +} + +.entity_actions input.submit { +display:block; +text-align:left; +width:100%; +} +.entity_actions a, +.entity_nudge p, +.entity_remote_subscribe { +text-decoration:none; +font-weight:bold; +display:block; +} + +.form_user_block input.submit, +.form_user_unblock input.submit, +.entity_send-a-message a, +.entity_edit a, +.form_user_nudge input.submit, +.entity_nudge p { +border:0; +padding-left:20px; +} + +.entity_edit a, +.entity_send-a-message a, +.entity_nudge p { +padding:4px 4px 4px 23px; +} + +.entity_remote_subscribe { +padding:4px; +border-width:2px; +border-style:solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} +.entity_actions .accept { +margin-bottom:18px; +} + +.entity_tags ul { +list-style-type:none; +display:inline; +} +.entity_tags li { +display:inline; +margin-right:4px; +} + +.aside .section { +margin-bottom:18px; +clear:both; +float:left; +width:100%; +} +.aside .section h2 { +font-size:110%; +text-transform:none; +} + +#entity_statistics dt, +#entity_statistics dd { +display:inline; +} +#entity_statistics dt:after { +content: ":"; +} + +.section ul.entities { +float:left; +width:100%; +} +.section .entities li { +list-style-type:none; +float:left; +margin-right:7px; +margin-bottom:7px; +} +.section .entities li .photo { +margin-right:0; +margin-bottom:0; +} +.section .entities li .fn { +display:none; +} + +.aside .section p, +.aside .section .more { +clear:both; +} + +.profile .entity_profile { +margin-bottom:0; +min-height:60px; +} + + +.profile .form_group_join legend, +.profile .form_group_leave legend, +.profile .form_user_subscribe legend, +.profile .form_user_unsubscribe legend { +display:none; +} + +.profiles { +list-style-type:none; +} +.profile .entity_profile .entity_location { +width:auto; +clear:none; +margin-left:11px; +} +.profile .entity_profile dl, +.profile .entity_profile dd { +display:inline; +float:none; +} +.profile .entity_profile .entity_note, +.profile .entity_profile .entity_url, +.profile .entity_profile .entity_tags, +.profile .entity_profile .form_subscription_edit { +margin-left:59px; +clear:none; +display:block; +width:auto; +} +.profile .entity_profile .entity_tags dt { +display:inline; +margin-right:11px; +} + + +.profile .entity_profile .form_subscription_edit label { +font-weight:normal; +margin-right:11px; +} + + +/* NOTICE */ +.notice, +.profile { +position:relative; +padding-top:11px; +padding-bottom:11px; +clear:both; +float:left; +width:100%; +border-top-width:1px; +border-top-style:dotted; +font-size:1.2em; +} +.notices li { +list-style-type:none; +line-height:1.1; +width:94%; +padding-right:5%; +padding-left:1%; +min-height:47px; +} + + +/* NOTICES */ +#notices_primary { +float:left; +width:100%; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} +#notices_primary h2 { +display:none; +} +.notice-data a span { +display:block; +padding-left:28px; +} + +.notice .author { +margin-right:11px; +} + +.fn { +overflow:hidden; +} + +.notice .author .fn { +font-weight:bold; +} + +.notice .author .photo { +margin-bottom:0; +} + +.vcard .photo { +display:inline; +margin-right:11px; +margin-bottom:11px; +float:left; +} +.vcard .url { +text-decoration:none; +} +.vcard .url:hover { +text-decoration:underline; +} + +.notice .entry-title { +float:none; +display:inline; +width:100%; +overflow:hidden; +} +#shownotice .notice .entry-title { +font-size:2.2em; +} + +.notice p.entry-content { +display:inline; +} + +.notice p.entry-content .vcard a { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} + +.notice div.entry-content { +font-size:0.95em; +margin-left:59px; +margin-top:3px; +width:70%; +font-family:Georgia, serif; +font-style:italic; +font-size:0.8em; +display:block; +} +.notice div.entry-content a { +text-decoration:none; +} +.notice div.entry-content a:hover { +text-decoration:underline; +} +#showstream .notice div.entry-content { +margin-left:0; +} + +.notice .notice-options a, +.notice .notice-options input { +float:left; +font-size:1.025em; +} + +.notice div.entry-content dl, +.notice div.entry-content dt, +.notice div.entry-content dd { +display:inline; +} + +.notice div.entry-content .timestamp dt, +.notice div.entry-content .response dt { +display:none; +} +.notice div.entry-content .timestamp a { +display:inline-block; +} +.notice div.entry-content .device dt { +text-transform:lowercase; +} + + + +.notice-data { +position:absolute; +top:18px; +right:0; +min-height:50px; +margin-bottom:4px; +} +.notice .entry-content .notice-data dt { +display:none; +} + +.notice-data a { +display:block; +outline:none; +} + +.notice-options { +padding-left:2%; +float:left; +width:50%; +font-size:0.95em; +width:12.5%; +float:right; +display:none; +} +.notices li.hover div.notice-options { +display:block; +} + + +.notice-options a { +float:left; +} +.notice-options .notice_delete, +.notice-options .notice_reply, +.notice-options .form_favor, +.notice-options .form_disfavor { +position:absolute; +} +.notice-options .form_favor, +.notice-options .form_disfavor { +top:7px; +right:7px; +} +.notice-options .notice_reply { +top:30px; +right:7px; +} +.notice-options .notice_delete { +bottom:7px; +right:7px; +} +.notice-options .notice_reply dt { +display:none; +} + +.notice-options input, +.notice-options a { +text-indent:-9999px; +outline:none; +} + +.notice-options .notice_reply a, +.notice-options input.submit { +display:block; +border:0; +} +.notice-options .notice_reply a, +.notice-options .notice_delete a { +text-decoration:none; +padding-left:16px; +} + +.notice-options form input.submit { +width:16px; +padding:2px 0; +} + +.notice-options .notice_delete dt, +.notice-options .form_favor legend, +.notice-options .form_disfavor legend { +display:none; +} +.notice-options .notice_delete fieldset, +.notice-options .form_favor fieldset, +.notice-options .form_disfavor fieldset { +border:0; +padding:0; +} + + +#usergroups #new_group { +float: left; +margin-right: 2em; +} +#new_group, #group_search { +margin-bottom:18px; +} +#new_group a { +padding-left:20px; +} + + +#filter_tags { +margin-bottom:11px; +float:left; +} +#filter_tags dt { +display:none; +} +#filter_tags ul { +list-style-type:none; +} +#filter_tags ul li { +float:left; +margin-left:7px; +padding-left:7px; +border-left-width:1px; +border-left-style:solid; +} +#filter_tags ul li.child_1 { +margin-left:0; +border-left:0; +padding-left:0; +} +#filter_tags ul li#filter_tags_all a { +font-weight:bold; +margin-top:7px; +float:left; +} + +#filter_tags ul li#filter_tags_item label { +margin-right:7px; +} +#filter_tags ul li#filter_tags_item label, +#filter_tags ul li#filter_tags_item select { +display:inline; +} +#filter_tags ul li#filter_tags_item p { +float:left; +margin-left:38px; +} +#filter_tags ul li#filter_tags_item input { +position:relative; +top:3px; +left:3px; +} + + + +.pagination { +float:left; +clear:both; +width:100%; +margin-top:18px; +} + +.pagination dt { +font-weight:bold; +display:none; +} + +.pagination .nav { +float:left; +width:100%; +list-style-type:none; +} + +.pagination .nav_prev { +float:left; +} +.pagination .nav_next { +float:right; +} + +.pagination a { +display:block; +text-decoration:none; +font-weight:bold; +padding:7px; +border-width:1px; +border-style:solid; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-radius:7px; +} + +.pagination .nav_prev a { +padding-left:30px; +} +.pagination .nav_next a { +padding-right:30px; +} +/* END: NOTICE */ + + +.hentry .entry-content p { +margin-bottom:18px; +} +.hentry entry-content ol, +.hentry .entry-content ul { +list-style-position:inside; +} +.hentry .entry-content li { +margin-bottom:18px; +} +.hentry .entry-content li li { +margin-left:18px; +} + + + + +/* TOP_POSTERS */ +.section tbody td { +padding-right:11px; +padding-bottom:11px; +} +.section .vcard .photo { +margin-right:7px; +margin-bottom:0; +} + +.section .notice { +padding-top:7px; +padding-bottom:7px; +border-top:0; +} + +.section .notice:first-child { +padding-top:0; +} + +.section .notice .author { +margin-right:0; +} +.section .notice .author .fn { +display:none; +} + + +/* tagcloud */ +.tag-cloud { +list-style-type:none; +text-align:center; +} +.aside .tag-cloud { +font-size:0.8em; +} +.tag-cloud li { +display:inline; +margin-right:7px; +line-height:1.25; +} +.aside .tag-cloud li { +line-height:1.5; +} +.tag-cloud li a { +text-decoration:none; +} +#tagcloud.section dt { +text-transform:uppercase; +font-weight:bold; +} +.tag-cloud-1 { +font-size:1em; +} +.tag-cloud-2 { +font-size:1.25em; +} +.tag-cloud-3 { +font-size:1.75em; +} +.tag-cloud-4 { +font-size:2em; +} +.tag-cloud-5 { +font-size:2.25em; +} +.tag-cloud-6 { +font-size:2.75em; +} +.tag-cloud-7 { +font-size:3.25em; +} + +#publictagcloud #tagcloud.section dt { +display:none; +} + +#form_settings_photo .form_data { +clear:both; +} + +#form_settings_avatar li { +width:auto; +} +#form_settings_avatar input { +margin-left:0; +} +#avatar_original, +#avatar_preview { +float:left; +} +#avatar_preview { +margin-left:29px; +} +#avatar_preview_view { +height:96px; +width:96px; +margin-bottom:18px; +overflow:hidden; +} + +#settings_attach, +#form_settings_avatar .form_actions { +clear:both; +} + +#form_settings_avatar .form_actions { +margin-bottom:0; +} + +.instructions ul { +list-style-position:inside; +} +.instructions p, +.instructions ul { +margin-bottom:18px; +} +.help dt { +display:none; +} +.guide { +clear:both; +} + +#public.user_in #content, +#groups.user_in #content, +#publictagcloud.user_in #content, +#featured.user_in #content, +#favorited.user_in #content, +#all.user_in #content, +#replies.user_in #content, +#showstream.user_in #content, +#showfavorites.user_in #content, +#inbox.user_in #content, +#outbox.user_in #content, +#subscriptions.user_in #content, +#subscribers.user_in #content, +#showgroup.user_in #content { +padding-top:160px; +} + +#profilesettings #form_notice, +#avatarsettings #form_notice, +#passwordsettings #form_notice, +#emailsettings #form_notice, +#openidsettings #form_notice, +#othersettings #form_notice, +#smssettings #form_notice, +#twittersettings #form_notice, +#imsettings #form_notice, +#doc #form_notice, +#usergroups #form_notice, +#invite #form_notice, +#deletenotice #form_notice, +#newgroup #form_notice, +#register #form_notice, +#shownotice #form_notice, +#confirmaddress #form_notice, +#tag #form_notice { +display:none; +} + + +html, +body, +a:active { +background-color:#9AE4E8; +} +body { +font-family:'Lucida Grande',sans-serif; +background:#9AE4E8 url(../images/illustrations/illu_clouds-01.gif) 0 0 no-repeat; +color:#333333; +} +#core { +background:url(../images/illustrations/illu_arrow-up-01.gif) no-repeat 25px 0; +} + +input, textarea, select, option { +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +} +input, textarea, select, +.entity_remote_subscribe { +border-color:#aaa; +} +#filter_tags ul li { +border-color:#ddd; +} + +.form_settings input.form_action-secondary { +background:none; +} + +input.submit, +#form_notice.warning #notice_text-count, +#nav_register a, +.form_settings .form_note, +.entity_remote_subscribe { +background-color:#9BB43E; +} + +input:focus, textarea:focus, select:focus, +#form_notice.warning #notice_data-text { +border-color:#9BB43E; +} +input.submit, +#nav_register a, +.entity_remote_subscribe { +color:#fff; +} + +a, +div.notice-options input, +.form_user_block input.submit, +.form_user_unblock input.submit, +.entity_send-a-message a, +.form_user_nudge input.submit, +.entity_nudge p, +.form_settings input.form_action-secondary { +color:#0084B4; +} + +.notice, +.profile { +border-top-color:#DDFFCC; +} +.section .profile { +border-top-color:#87B4C8; +} + + +#content .notice p.entry-content a:visited { +background-color:#fcfcfc; +} +#content .notice p.entry-content .vcard a { +background-color:#fcfffc; +} + +#aside_primary { +background-color:#DDFFCC; +} + + +#notice_text-count { +color:#333; +} +#form_notice.warning #notice_text-count { +color:#000; +} +#form_notice.processing #notice_action-submit { +background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; +cursor:wait; +text-indent:-9999px; +} + +#content, +#site_nav_local_views a, +#aside_primary { +border-color:#fff; +} +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + +#site_nav_local_views a { +background-color:rgba(135, 180, 200, 0.3); +} +#site_nav_local_views a:hover { +background-color:rgba(255, 255, 255, 0.7); +} + + +.error { +background-color:#F7E8E8; +} +.success { +background-color:#EFF3DC; +} + + +#anon_notice { +background-color:#FEFFDF; +color:#333; +border-color:#fff; +} + +#showstream #anon_notice { +background-color:#FEFFDF; +} + + +#export_data li a { +background-repeat:no-repeat; +background-position:0 45%; +} +#export_data li a.rss { +background-image:url(../../base/images/icons/icon_rss.png); +} +#export_data li a.atom { +background-image:url(../../base/images/icons/icon_atom.png); +} +#export_data li a.foaf { +background-image:url(../../base/images/icons/icon_foaf.gif); +} + +.entity_edit a, +.entity_send-a-message a, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit, +.entity_nudge p { +background-position: 0 40%; +background-repeat: no-repeat; +background-color:transparent; +} +.form_group_join input.submit, +.form_group_leave input.submit +.form_user_subscribe input.submit, +.form_user_unsubscribe input.submit { +background-color:#9BB43E; +color:#fff; +} +.form_user_unsubscribe input.submit, +.form_group_leave input.submit { +background-color:#87B4C8; +} + +.entity_edit a { +background-image:url(../images/icons/twotone/green/edit.gif); +} +.entity_send-a-message a { +background-image:url(../images/icons/twotone/green/quote.gif); +} +.entity_nudge p, +.form_user_nudge input.submit { +background-image:url(../images/icons/twotone/green/mail.gif); +} +.form_user_block input.submit, +.form_user_unblock input.submit { +background-image:url(../images/icons/twotone/green/shield.gif); +} + + + +/* NOTICES */ +.notices li.over { +background-color:#fcfcfc; +} + +.notice-options .notice_reply a, +.notice-options form input.submit { +background-color:transparent; +} +.notice-options .notice_reply a { +background:transparent url(../images/icons/icon_reply.gif) no-repeat 0 45%; +} +.notice-options form.form_favor input.submit { +background:transparent url(../images/icons/icon_favourite.gif) no-repeat 0 45%; +} +.notice-options form.form_disfavor input.submit { +background:transparent url(../images/icons/icon_disfavourite.gif) no-repeat 0 45%; +} +.notice-options .notice_delete a { +background:transparent url(../images/icons/icon_trash.gif) no-repeat 0 45%; +} + +.notices div.entry-content, +.notices div.notice-options { +opacity:0.4; +} +.notices li.hover div.entry-content, +.notices li.hover div.notice-options { +opacity:1; +} +div.entry-content { +color:#333; +} +div.notice-options a, +div.notice-options input { +font-family:sans-serif; +} +.notices li.hover { +background-color:#fcfcfc; +} +/*END: NOTICES */ + + +#new_group a { +background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%; +} + +.pagination .nav_prev a, +.pagination .nav_next a { +background-repeat:no-repeat; +border-color:#DDFFCC; +} +.pagination .nav_prev a { +background-image:url(../../base/images/icons/twotone/green/arrow-left.gif); +background-position:10% 45%; +} +.pagination .nav_next a { +background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); +background-position:90% 45%; +} + + +/*--------------------------------------*/ + +#anon_notice { +background:url(../images/illustrations/illu_unicorn-01.png) no-repeat 0 0; +} +#showstream #anon_notice, +#content .notice p.entry-content a:visited, +content .notice p.entry-content .vcard a { +background-color:transparent; +} + +#anon_notice p { +background-color:#FEFFDF; +border-color:#FFFF00; +} + + +#form_notice .form_note { +color:#CCC; +} +input.submit { +background-color:#eee; +color:#666; +} + +.notices li.hover { +background-color:#F7F7F7; +} + + +.notice div.entry-content, +.notice div.entry-content a { +color:#999; +} + +.notices div.entry-content, +.notices div.notice-options { +opacity:1; +} + +#site_nav_local_views { +background-color:#DDFFCC; +} +#site_nav_local_views li, +#aside_primary { +border-color:#BDDCAD; +} +#site_nav_local_views a, +.aside .section h2 { +background-color:transparent; +border-color:transparent; +color:#4C4C4C; +} +#site_nav_local_views .current { +border-left-color:#fff; +} + +#site_nav_local_views .current a, +#site_nav_global_primary, +#footer { +background-color:#fff; +} + diff --git a/theme/cloudy/css/ie.css b/theme/cloudy/css/ie.css new file mode 100644 index 000000000..095122100 --- /dev/null +++ b/theme/cloudy/css/ie.css @@ -0,0 +1,34 @@ +/* IE specific styles */ + +.notice-options input.submit { +color:#fff; +} + +#site_nav_local_views a { +background-color:#ddffcc; +} + +#aside_primary { +width:181px; +} + +#form_notice, +#anon_notice { +top:158px; +} + +#public #content, +#groups #content, +#publictagcloud #content, +#featured #content, +#favorited #content, +#all #content, +#replies #content, +#showstream #content, +#showfavorites #content, +#inbox #content, +#outbox #content, +#subscriptions #content, +#subscribers #content { +padding-top:138px; +} diff --git a/theme/cloudy/images/icons/icon_atom.png b/theme/cloudy/images/icons/icon_atom.png new file mode 100644 index 000000000..6a001f11a Binary files /dev/null and b/theme/cloudy/images/icons/icon_atom.png differ diff --git a/theme/cloudy/images/icons/icon_disfavourite.gif b/theme/cloudy/images/icons/icon_disfavourite.gif new file mode 100644 index 000000000..2b02ac8a6 Binary files /dev/null and b/theme/cloudy/images/icons/icon_disfavourite.gif differ diff --git a/theme/cloudy/images/icons/icon_favourite.gif b/theme/cloudy/images/icons/icon_favourite.gif new file mode 100644 index 000000000..716ce3549 Binary files /dev/null and b/theme/cloudy/images/icons/icon_favourite.gif differ diff --git a/theme/cloudy/images/icons/icon_foaf.gif b/theme/cloudy/images/icons/icon_foaf.gif new file mode 100644 index 000000000..f8f784423 Binary files /dev/null and b/theme/cloudy/images/icons/icon_foaf.gif differ diff --git a/theme/cloudy/images/icons/icon_processing.gif b/theme/cloudy/images/icons/icon_processing.gif new file mode 100644 index 000000000..d0bce1542 Binary files /dev/null and b/theme/cloudy/images/icons/icon_processing.gif differ diff --git a/theme/cloudy/images/icons/icon_reply.gif b/theme/cloudy/images/icons/icon_reply.gif new file mode 100644 index 000000000..a4379a70b Binary files /dev/null and b/theme/cloudy/images/icons/icon_reply.gif differ diff --git a/theme/cloudy/images/icons/icon_rss.png b/theme/cloudy/images/icons/icon_rss.png new file mode 100644 index 000000000..0ccd1ce25 Binary files /dev/null and b/theme/cloudy/images/icons/icon_rss.png differ diff --git a/theme/cloudy/images/icons/icon_trash.gif b/theme/cloudy/images/icons/icon_trash.gif new file mode 100644 index 000000000..916a332a3 Binary files /dev/null and b/theme/cloudy/images/icons/icon_trash.gif differ diff --git a/theme/cloudy/images/icons/icon_vcard.gif b/theme/cloudy/images/icons/icon_vcard.gif new file mode 100644 index 000000000..6d52947f3 Binary files /dev/null and b/theme/cloudy/images/icons/icon_vcard.gif differ diff --git a/theme/cloudy/images/icons/twotone/green/arrow-left.gif b/theme/cloudy/images/icons/twotone/green/arrow-left.gif new file mode 100644 index 000000000..afed19084 Binary files /dev/null and b/theme/cloudy/images/icons/twotone/green/arrow-left.gif differ diff --git a/theme/cloudy/images/icons/twotone/green/arrow-right.gif b/theme/cloudy/images/icons/twotone/green/arrow-right.gif new file mode 100644 index 000000000..ee1707ed9 Binary files /dev/null and b/theme/cloudy/images/icons/twotone/green/arrow-right.gif differ diff --git a/theme/cloudy/images/icons/twotone/green/edit.gif b/theme/cloudy/images/icons/twotone/green/edit.gif new file mode 100644 index 000000000..c746aca60 Binary files /dev/null and b/theme/cloudy/images/icons/twotone/green/edit.gif differ diff --git a/theme/cloudy/images/icons/twotone/green/mail.gif b/theme/cloudy/images/icons/twotone/green/mail.gif new file mode 100644 index 000000000..1084c862f Binary files /dev/null and b/theme/cloudy/images/icons/twotone/green/mail.gif differ diff --git a/theme/cloudy/images/icons/twotone/green/news.gif b/theme/cloudy/images/icons/twotone/green/news.gif new file mode 100644 index 000000000..712c685dc Binary files /dev/null and b/theme/cloudy/images/icons/twotone/green/news.gif differ diff --git a/theme/cloudy/images/icons/twotone/green/quote.gif b/theme/cloudy/images/icons/twotone/green/quote.gif new file mode 100644 index 000000000..4ba1f0c03 Binary files /dev/null and b/theme/cloudy/images/icons/twotone/green/quote.gif differ diff --git a/theme/cloudy/images/icons/twotone/green/shield.gif b/theme/cloudy/images/icons/twotone/green/shield.gif new file mode 100644 index 000000000..419d5ee4b Binary files /dev/null and b/theme/cloudy/images/icons/twotone/green/shield.gif differ diff --git a/theme/cloudy/images/illustrations/illu_arrow-up-01.gif b/theme/cloudy/images/illustrations/illu_arrow-up-01.gif new file mode 100644 index 000000000..577be1871 Binary files /dev/null and b/theme/cloudy/images/illustrations/illu_arrow-up-01.gif differ diff --git a/theme/cloudy/images/illustrations/illu_clouds-01.gif b/theme/cloudy/images/illustrations/illu_clouds-01.gif new file mode 100644 index 000000000..41cd622cf Binary files /dev/null and b/theme/cloudy/images/illustrations/illu_clouds-01.gif differ diff --git a/theme/cloudy/images/illustrations/illu_jcrop.gif b/theme/cloudy/images/illustrations/illu_jcrop.gif new file mode 100644 index 000000000..72ea7ccb5 Binary files /dev/null and b/theme/cloudy/images/illustrations/illu_jcrop.gif differ diff --git a/theme/cloudy/images/illustrations/illu_progress_loading-01.gif b/theme/cloudy/images/illustrations/illu_progress_loading-01.gif new file mode 100644 index 000000000..82290f483 Binary files /dev/null and b/theme/cloudy/images/illustrations/illu_progress_loading-01.gif differ diff --git a/theme/cloudy/images/illustrations/illu_unicorn-01.png b/theme/cloudy/images/illustrations/illu_unicorn-01.png new file mode 100644 index 000000000..6cb51b298 Binary files /dev/null and b/theme/cloudy/images/illustrations/illu_unicorn-01.png differ diff --git a/theme/cloudy/skin/default/css/display.css b/theme/cloudy/skin/default/css/display.css deleted file mode 100644 index b30ca9d0d..000000000 --- a/theme/cloudy/skin/default/css/display.css +++ /dev/null @@ -1,314 +0,0 @@ -/** theme: twitter - * - * @package Laconica - * @author Sarven Capadisli - * @copyright 2009 Control Yourself, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ - */ -html, -body, -a:active { -background-color:#9AE4E8; -} -body { -font-family:'Lucida Grande',sans-serif; -background:#9AE4E8 url(../images/illustrations/illu_clouds-01.gif) 0 0 no-repeat; -color:#333333; -} -#core { -background:url(../images/illustrations/illu_arrow-up-01.gif) no-repeat 25px 0; -} - -input, textarea, select, option { -font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; -} -input, textarea, select, -.entity_remote_subscribe { -border-color:#aaa; -} -#filter_tags ul li { -border-color:#ddd; -} - -.form_settings input.form_action-secondary { -background:none; -} - -input.submit, -#form_notice.warning #notice_text-count, -#nav_register a, -.form_settings .form_note, -.entity_remote_subscribe { -background-color:#9BB43E; -} - -input:focus, textarea:focus, select:focus, -#form_notice.warning #notice_data-text { -border-color:#9BB43E; -} -input.submit, -#nav_register a, -.entity_remote_subscribe { -color:#fff; -} - -a, -div.notice-options input, -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_send-a-message a, -.form_user_nudge input.submit, -.entity_nudge p, -.form_settings input.form_action-secondary { -color:#0084B4; -} - -.notice, -.profile { -border-top-color:#DDFFCC; -} -.section .profile { -border-top-color:#87B4C8; -} - - -#content .notice p.entry-content a:visited { -background-color:#fcfcfc; -} -#content .notice p.entry-content .vcard a { -background-color:#fcfffc; -} - -#aside_primary { -background-color:#DDFFCC; -} - - -#notice_text-count { -color:#333; -} -#form_notice.warning #notice_text-count { -color:#000; -} -#form_notice.processing #notice_action-submit { -background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; -cursor:wait; -text-indent:-9999px; -} - -#content, -#site_nav_local_views a, -#aside_primary { -border-color:#fff; -} -#content, -#site_nav_local_views .current a { -background-color:#fff; -} - -#site_nav_local_views a { -background-color:rgba(135, 180, 200, 0.3); -} -#site_nav_local_views a:hover { -background-color:rgba(255, 255, 255, 0.7); -} - - -.error { -background-color:#F7E8E8; -} -.success { -background-color:#EFF3DC; -} - - -#anon_notice { -background-color:#FEFFDF; -color:#333; -border-color:#fff; -} - -#showstream #anon_notice { -background-color:#FEFFDF; -} - - -#export_data li a { -background-repeat:no-repeat; -background-position:0 45%; -} -#export_data li a.rss { -background-image:url(../../../base/images/icons/icon_rss.png); -} -#export_data li a.atom { -background-image:url(../../../base/images/icons/icon_atom.png); -} -#export_data li a.foaf { -background-image:url(../../../base/images/icons/icon_foaf.gif); -} - -.entity_edit a, -.entity_send-a-message a, -.form_user_nudge input.submit, -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_nudge p { -background-position: 0 40%; -background-repeat: no-repeat; -background-color:transparent; -} -.form_group_join input.submit, -.form_group_leave input.submit -.form_user_subscribe input.submit, -.form_user_unsubscribe input.submit { -background-color:#9BB43E; -color:#fff; -} -.form_user_unsubscribe input.submit, -.form_group_leave input.submit { -background-color:#87B4C8; -} - -.entity_edit a { -background-image:url(../images/icons/twotone/green/edit.gif); -} -.entity_send-a-message a { -background-image:url(../images/icons/twotone/green/quote.gif); -} -.entity_nudge p, -.form_user_nudge input.submit { -background-image:url(../images/icons/twotone/green/mail.gif); -} -.form_user_block input.submit, -.form_user_unblock input.submit { -background-image:url(../images/icons/twotone/green/shield.gif); -} - - - -/* NOTICES */ -.notices li.over { -background-color:#fcfcfc; -} - -.notice-options .notice_reply a, -.notice-options form input.submit { -background-color:transparent; -} -.notice-options .notice_reply a { -background:transparent url(../images/icons/icon_reply.gif) no-repeat 0 45%; -} -.notice-options form.form_favor input.submit { -background:transparent url(../images/icons/icon_favourite.gif) no-repeat 0 45%; -} -.notice-options form.form_disfavor input.submit { -background:transparent url(../images/icons/icon_disfavourite.gif) no-repeat 0 45%; -} -.notice-options .notice_delete a { -background:transparent url(../images/icons/icon_trash.gif) no-repeat 0 45%; -} - -.notices div.entry-content, -.notices div.notice-options { -opacity:0.4; -} -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { -opacity:1; -} -div.entry-content { -color:#333; -} -div.notice-options a, -div.notice-options input { -font-family:sans-serif; -} -.notices li.hover { -background-color:#fcfcfc; -} -/*END: NOTICES */ - - -#new_group a { -background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; -} - -.pagination .nav_prev a, -.pagination .nav_next a { -background-repeat:no-repeat; -border-color:#DDFFCC; -} -.pagination .nav_prev a { -background-image:url(../images/icons/twotone/green/arrow-left.gif); -background-position:10% 45%; -} -.pagination .nav_next a { -background-image:url(../images/icons/twotone/green/arrow-right.gif); -background-position:90% 45%; -} - - -/*--------------------------------------*/ - -#anon_notice { -background:url(../images/illustrations/illu_unicorn-01.png) no-repeat 0 0; -} -#showstream #anon_notice, -#content .notice p.entry-content a:visited, -content .notice p.entry-content .vcard a { -background-color:transparent; -} - -#anon_notice p { -background-color:#FEFFDF; -border-color:#FFFF00; -} - - -#form_notice .form_note { -color:#CCC; -} -input.submit { -background-color:#eee; -color:#666; -} - -.notices li.hover { -background-color:#F7F7F7; -} - - -.notice div.entry-content, -.notice div.entry-content a { -color:#999; -} - -.notices div.entry-content, -.notices div.notice-options { -opacity:1; -} - -#site_nav_local_views { -background-color:#DDFFCC; -} -#site_nav_local_views li, -#aside_primary { -border-color:#BDDCAD; -} -#site_nav_local_views a, -.aside .section h2 { -background-color:transparent; -border-color:transparent; -color:#4C4C4C; -} -#site_nav_local_views .current { -border-left-color:#fff; -} - -#site_nav_local_views .current a, -#site_nav_global_primary, -#footer { -background-color:#fff; -} - diff --git a/theme/cloudy/skin/default/css/ie.css b/theme/cloudy/skin/default/css/ie.css deleted file mode 100644 index 095122100..000000000 --- a/theme/cloudy/skin/default/css/ie.css +++ /dev/null @@ -1,34 +0,0 @@ -/* IE specific styles */ - -.notice-options input.submit { -color:#fff; -} - -#site_nav_local_views a { -background-color:#ddffcc; -} - -#aside_primary { -width:181px; -} - -#form_notice, -#anon_notice { -top:158px; -} - -#public #content, -#groups #content, -#publictagcloud #content, -#featured #content, -#favorited #content, -#all #content, -#replies #content, -#showstream #content, -#showfavorites #content, -#inbox #content, -#outbox #content, -#subscriptions #content, -#subscribers #content { -padding-top:138px; -} diff --git a/theme/cloudy/skin/default/images/icons/icon_atom.jpg b/theme/cloudy/skin/default/images/icons/icon_atom.jpg deleted file mode 100644 index 22853edc4..000000000 Binary files a/theme/cloudy/skin/default/images/icons/icon_atom.jpg and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/icon_disfavourite.gif b/theme/cloudy/skin/default/images/icons/icon_disfavourite.gif deleted file mode 100644 index 2b02ac8a6..000000000 Binary files a/theme/cloudy/skin/default/images/icons/icon_disfavourite.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/icon_favourite.gif b/theme/cloudy/skin/default/images/icons/icon_favourite.gif deleted file mode 100644 index 716ce3549..000000000 Binary files a/theme/cloudy/skin/default/images/icons/icon_favourite.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/icon_foaf.gif b/theme/cloudy/skin/default/images/icons/icon_foaf.gif deleted file mode 100644 index f8f784423..000000000 Binary files a/theme/cloudy/skin/default/images/icons/icon_foaf.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/icon_reply.gif b/theme/cloudy/skin/default/images/icons/icon_reply.gif deleted file mode 100644 index a4379a70b..000000000 Binary files a/theme/cloudy/skin/default/images/icons/icon_reply.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/icon_rss.jpg b/theme/cloudy/skin/default/images/icons/icon_rss.jpg deleted file mode 100644 index da23422d0..000000000 Binary files a/theme/cloudy/skin/default/images/icons/icon_rss.jpg and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/icon_trash.gif b/theme/cloudy/skin/default/images/icons/icon_trash.gif deleted file mode 100644 index 916a332a3..000000000 Binary files a/theme/cloudy/skin/default/images/icons/icon_trash.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/icon_vcard.gif b/theme/cloudy/skin/default/images/icons/icon_vcard.gif deleted file mode 100644 index 6d52947f3..000000000 Binary files a/theme/cloudy/skin/default/images/icons/icon_vcard.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/arrow-left.gif b/theme/cloudy/skin/default/images/icons/twotone/green/arrow-left.gif deleted file mode 100644 index afed19084..000000000 Binary files a/theme/cloudy/skin/default/images/icons/twotone/green/arrow-left.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/arrow-right.gif b/theme/cloudy/skin/default/images/icons/twotone/green/arrow-right.gif deleted file mode 100644 index ee1707ed9..000000000 Binary files a/theme/cloudy/skin/default/images/icons/twotone/green/arrow-right.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/edit.gif b/theme/cloudy/skin/default/images/icons/twotone/green/edit.gif deleted file mode 100644 index c746aca60..000000000 Binary files a/theme/cloudy/skin/default/images/icons/twotone/green/edit.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/mail.gif b/theme/cloudy/skin/default/images/icons/twotone/green/mail.gif deleted file mode 100644 index 1084c862f..000000000 Binary files a/theme/cloudy/skin/default/images/icons/twotone/green/mail.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/news.gif b/theme/cloudy/skin/default/images/icons/twotone/green/news.gif deleted file mode 100644 index 712c685dc..000000000 Binary files a/theme/cloudy/skin/default/images/icons/twotone/green/news.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/quote.gif b/theme/cloudy/skin/default/images/icons/twotone/green/quote.gif deleted file mode 100644 index 4ba1f0c03..000000000 Binary files a/theme/cloudy/skin/default/images/icons/twotone/green/quote.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/icons/twotone/green/shield.gif b/theme/cloudy/skin/default/images/icons/twotone/green/shield.gif deleted file mode 100644 index 419d5ee4b..000000000 Binary files a/theme/cloudy/skin/default/images/icons/twotone/green/shield.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/illustrations/illu_arrow-up-01.gif b/theme/cloudy/skin/default/images/illustrations/illu_arrow-up-01.gif deleted file mode 100644 index 577be1871..000000000 Binary files a/theme/cloudy/skin/default/images/illustrations/illu_arrow-up-01.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/illustrations/illu_clouds-01.gif b/theme/cloudy/skin/default/images/illustrations/illu_clouds-01.gif deleted file mode 100644 index 41cd622cf..000000000 Binary files a/theme/cloudy/skin/default/images/illustrations/illu_clouds-01.gif and /dev/null differ diff --git a/theme/cloudy/skin/default/images/illustrations/illu_unicorn-01.png b/theme/cloudy/skin/default/images/illustrations/illu_unicorn-01.png deleted file mode 100644 index 6cb51b298..000000000 Binary files a/theme/cloudy/skin/default/images/illustrations/illu_unicorn-01.png and /dev/null differ diff --git a/theme/default/base/css/display.css b/theme/default/base/css/display.css deleted file mode 100644 index a6fe8eb75..000000000 --- a/theme/default/base/css/display.css +++ /dev/null @@ -1,1177 +0,0 @@ -/** theme: base - * - * @package Laconica - * @author Sarven Capadisli - * @copyright 2009 Control Yourself, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ - */ - -* { margin:0; padding:0; } -img { display:block; border:0; } -a abbr { cursor: pointer; border-bottom:0; } -table { border-collapse:collapse; } -ol { list-style-position:inside; } -html { font-size: 87.5%; background-color:#fff; height:100%; } -body { -background-color:#fff; -color:#000; -font-family:sans-serif; -font-size:1em; -line-height:1.65; -position:relative; -} -h1,h2,h3,h4,h5,h6 { -margin-bottom:7px; -overflow:hidden; -} -h1 { -font-size:1.4em; -margin-bottom:18px; -} -#showstream h1 { display:none; } -h2 { font-size:1.3em; } -h3 { font-size:1.2em; } -h4 { font-size:1.1em; } -h5 { font-size:1em; } -h6 { font-size:0.9em; } - -caption { -font-weight:bold; -} -legend { -font-weight:bold; -font-size:1.3em; -} -input, textarea, select, option { -padding:4px; -font-family:sans-serif; -font-size:1em; -} -input, textarea, select { -border-width:2px; -border-style: solid; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} - -input.submit { -font-weight:bold; -cursor:pointer; -} -textarea { -overflow:auto; -} -option { -padding-bottom:0; -} -fieldset { -padding:0; -border:0; -} -form ul li { -list-style-type:none; -margin:0 0 18px 0; -} -form label { -font-weight:bold; -} -input.checkbox { -position:relative; -top:2px; -left:0; -border:0; -} - -.error, -.success { -padding:4px 7px; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -margin-bottom:18px; -} -form label.submit { -display:none; -} - -.form_settings { -clear:both; -} - -.form_settings fieldset { -margin-bottom:29px; -} -.form_settings input.remove { -margin-left:11px; -} -.form_settings .form_data li { -width:100%; -float:left; -} -.form_settings .form_data label { -float:left; -} -.form_settings .form_data textarea, -.form_settings .form_data select, -.form_settings .form_data input { -margin-left:11px; -float:left; -} -.form_settings .form_data input.submit { -margin-left:0; -} - -.form_settings label { -margin-top:2px; -width:152px; -} - -.form_actions label { -display:none; -} -.form_guide { -font-style:italic; -} - -.form_settings #settings_autosubscribe label { -display:inline; -font-weight:bold; -} - -#form_settings_profile legend, -#form_login legend, -#form_register legend, -#form_password legend, -#form_settings_avatar legend, -#newgroup legend, -#editgroup legend, -#form_tag_user legend, -#form_remote_subscribe legend, -#form_openid_login legend, -#form_search legend, -#form_invite legend, -#form_notice_delete legend, -#form_password_recover legend, -#form_password_change legend { -display:none; -} - -.form_settings .form_data p.form_guide { -clear:both; -margin-left:163px; -margin-bottom:0; -} - -.form_settings p { -margin-bottom:11px; -} - -.form_settings input.checkbox { -margin-top:3px; -margin-left:0; -} -.form_settings label.checkbox { -font-weight:normal; -margin-top:0; -margin-right:0; -margin-left:11px; -float:left; -width:90%; -} - - -#form_login p.form_guide, -#form_register #settings_rememberme p.form_guide, -#form_openid_login #settings_rememberme p.form_guide, -#settings_twitter_remove p.form_guide, -#form_search ul.form_data #q { -margin-left:0; -} - -.form_settings .form_note { -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -padding:0 7px; -} - - -.form_settings input.form_action-secondary { -margin-left:29px; -padding:0; -} - -#form_search .submit { -margin-left:11px; -} - -address { -float:left; -margin-bottom:18px; -margin-left:18px; -} -address.vcard img.logo { -margin-right:0; -} -address .fn { -font-weight:bold; -} -address img + .fn { -display:none; -} - -#header { -width:100%; -position:relative; -float:left; -padding-top:18px; -margin-bottom:29px; -} - -#site_nav_global_primary { -float:right; -margin-right:18px; -margin-bottom:11px; -margin-left:18px; -} -#site_nav_global_primary ul li { -display:inline; -margin-left:11px; -} - -.system_notice dt { -font-weight:bold; -text-transform:uppercase; -display:none; -} - -#site_notice { -position:absolute; -top:65px; -right:18px; -width:250px; -width:24%; -} -#page_notice { -clear:both; -margin-bottom:18px; -} - - -#anon_notice { -float:left; -width:43.2%; -padding:1.1%; -border-radius:7px; --moz-border-radius:7px; --webkit-border-radius:7px; -border-width:2px; -border-style:solid; -line-height:1.5; -font-size:1.1em; -font-weight:bold; -} - - -#footer { -float:left; -width:64%; -padding:18px; -} - -#site_nav_local_views { -width:100%; -float:left; -} -#site_nav_local_views dt { -display:none; -} -#site_nav_local_views li { -float:left; -margin-right:18px; -list-style-type:none; -} -#site_nav_local_views a { -float:left; -text-decoration:none; -padding:4px 11px; --moz-border-radius-topleft:4px; --moz-border-radius-topright:4px; --webkit-border-top-left-radius:4px; --webkit-border-top-right-radius:4px; -border-width:1px; -border-style:solid; -border-bottom:0; -text-shadow: 2px 2px 2px #ddd; -font-weight:bold; -} -#site_nav_local_views .nav { -float:left; -width:100%; -} - -#site_nav_global_primary dt, -#site_nav_global_secondary dt { -display:none; -} - -#site_nav_global_secondary { -margin-bottom:11px; -} - -#site_nav_global_secondary ul li { -display:inline; -margin-right:11px; -} -#export_data li a { -padding-left:20px; -} -#export_data li a.foaf { -padding-left:30px; -} -#export_data li a.export_vcard { -padding-left:28px; -} - -#export_data ul { -display:inline; -} -#export_data li { -list-style-type:none; -display:inline; -margin-left:11px; -} -#export_data li:first-child { -margin-left:0; -} - -#licenses { -font-size:0.9em; -} - -#licenses dt { -font-weight:bold; -display:none; -} -#licenses dd { -margin-bottom:11px; -line-height:1.5; -} - -#site_content_license_cc { -margin-bottom:0; -} -#site_content_license_cc img { -display:inline; -vertical-align:top; -margin-right:4px; -} - -#wrap { -margin:0 auto; -width:100%; -min-width:760px; -max-width:1003px; -overflow:hidden; -} - -#core { -position:relative; -width:100%; -float:left; -margin-bottom:1em; -} - -#content { -width:64.009%; -min-height:259px; -padding:1.795%; -float:left; -border-radius:7px; --moz-border-radius:7px; --moz-border-radius-topleft:0; --webkit-border-radius:7px; --webkit-border-top-left-radius:0; -border-style:solid; -border-width:1px; -} - -#content_inner { -position:relative; -width:100%; -float:left; -} - -#aside_primary { -width:27.917%; -min-height:259px; -float:left; -margin-left:0.385%; -padding:1.795%; -border-radius:7px; --moz-border-radius:7px; --webkit-border-radius:7px; -border-width:1px; -border-style:solid; -} - -#form_notice { -width:45.664%; -float:left; -position:relative; -line-height:1; -} -#form_notice fieldset { -border:0; -padding:0; -} -#form_notice legend { -display:none; -} -#form_notice textarea { -float:left; -border-radius:7px; --moz-border-radius:7px; --webkit-border-radius:7px; -width:80.789%; -height:67px; -line-height:1.5; -padding:7px 7px 16px 7px; -} -#form_notice label { -display:block; -float:left; -font-size:1.3em; -margin-bottom:7px; -} -#form_notice #notice_submit label { -display:none; -} -#form_notice .form_note { -position:absolute; -top:99px; -right:98px; -z-index:9; -} -#form_notice .form_note dt { -font-weight:bold; -display:none; -} -#notice_text-count { -font-weight:bold; -line-height:1.15; -padding:1px 2px; -} -#form_notice #notice_action-submit { -width:14%; -height:47px; -padding:0; -position:absolute; -bottom:0; -right:0; -} -#form_notice label[for=to] { -margin-top:7px; -} -#form_notice select[id=to] { -margin-bottom:7px; -margin-left:18px; -float:left; -} - - -/* entity_profile */ -.entity_profile { -position:relative; -width:67.702%; -min-height:123px; -float:left; -margin-bottom:18px; -margin-left:0; -overflow:hidden; -} -.entity_profile dt, -#entity_statistics dt { -font-weight:bold; -} -.entity_profile dd { -display:inline; -} - -.entity_profile .entity_depiction { -float:left; -width:96px; -margin-right:18px; -margin-bottom:18px; -} - -.entity_profile .entity_fn, -.entity_profile .entity_nickname, -.entity_profile .entity_location, -.entity_profile .entity_url, -.entity_profile .entity_note, -.entity_profile .entity_tags { -margin-left:113px; -margin-bottom:4px; -} - -.entity_profile .entity_fn, -.entity_profile .entity_nickname { -margin-left:11px; -display:inline; -font-weight:bold; -} -.entity_profile .entity_nickname { -margin-left:0; -} - -.entity_profile .entity_fn dd:before { -content: "("; -font-weight:normal; -} -.entity_profile .entity_fn dd:after { -content: ")"; -font-weight:normal; -} - -.entity_profile dt { -display:none; -} -.entity_profile h2 { -display:none; -} -/* entity_profile */ - - -/*entity_actions*/ -.entity_actions { -float:right; -margin-left:4.35%; -max-width:25%; -} -.entity_actions h2 { -display:none; -} -.entity_actions ul { -list-style-type:none; -} -.entity_actions li { -margin-bottom:4px; -} -.entity_actions li:first-child { -border-top:0; -} -.entity_actions fieldset { -border:0; -padding:0; -} -.entity_actions legend { -display:none; -} - -.entity_actions input.submit { -display:block; -text-align:left; -width:100%; -} -.entity_actions a, -.entity_nudge p, -.entity_remote_subscribe { -text-decoration:none; -font-weight:bold; -display:block; -} - -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_send-a-message a, -.entity_edit a, -.form_user_nudge input.submit, -.entity_nudge p { -border:0; -padding-left:20px; -} - -.entity_edit a, -.entity_send-a-message a, -.entity_nudge p { -padding:4px 4px 4px 23px; -} - -.entity_remote_subscribe { -padding:4px; -border-width:2px; -border-style:solid; -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} -.entity_actions .accept { -margin-bottom:18px; -} - -.entity_tags ul { -list-style-type:none; -display:inline; -} -.entity_tags li { -display:inline; -margin-right:4px; -} - -.aside .section { -margin-bottom:29px; -clear:both; -float:left; -width:100%; -} -.aside .section h2 { -text-transform:uppercase; -font-size:1em; -} - -#entity_statistics dt, -#entity_statistics dd { -display:inline; -} -#entity_statistics dt:after { -content: ":"; -} - -.section ul.entities { -float:left; -width:100%; -} -.section .entities li { -list-style-type:none; -float:left; -margin-right:7px; -margin-bottom:7px; -} -.section .entities li .photo { -margin-right:0; -margin-bottom:0; -} -.section .entities li .fn { -display:none; -} - -.aside .section p, -.aside .section .more { -clear:both; -} - -.profile .entity_profile { -margin-bottom:0; -min-height:60px; -} - - -.profile .form_group_join legend, -.profile .form_group_leave legend, -.profile .form_user_subscribe legend, -.profile .form_user_unsubscribe legend { -display:none; -} - -.profiles { -list-style-type:none; -} -.profile .entity_profile .entity_location { -width:auto; -clear:none; -margin-left:11px; -} -.profile .entity_profile dl, -.profile .entity_profile dd { -display:inline; -float:none; -} -.profile .entity_profile .entity_note, -.profile .entity_profile .entity_url, -.profile .entity_profile .entity_tags, -.profile .entity_profile .form_subscription_edit { -margin-left:59px; -clear:none; -display:block; -width:auto; -} -.profile .entity_profile .entity_tags dt { -display:inline; -margin-right:11px; -} - - -.profile .entity_profile .form_subscription_edit label { -font-weight:normal; -margin-right:11px; -} - - -/* NOTICE */ -.notice, -.profile { -position:relative; -padding-top:11px; -padding-bottom:11px; -clear:both; -float:left; -width:100%; -border-top-width:1px; -border-top-style:dotted; -} -.notices li { -list-style-type:none; -} -.notices li.hover { -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} - -/* NOTICES */ -#notices_primary { -float:left; -width:100%; -border-radius:7px; --moz-border-radius:7px; --webkit-border-radius:7px; -} -#notices_primary h2 { -display:none; -} -.notice-data a span { -display:block; -padding-left:28px; -} - -.notice .author { -margin-right:11px; -} - -.fn { -overflow:hidden; -} - -.notice .author .fn { -font-weight:bold; -} - -.notice .author .photo { -margin-bottom:0; -} - -.vcard .photo { -display:inline; -margin-right:11px; -margin-bottom:11px; -float:left; -} -.vcard .url { -text-decoration:none; -} -.vcard .url:hover { -text-decoration:underline; -} - -.notice .entry-title { -float:left; -width:100%; -overflow:hidden; -} -#shownotice .notice .entry-title { -font-size:2.2em; -} - -.notice p.entry-content { -display:inline; -} - -#content .notice p.entry-content a:visited { -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} -.notice p.entry-content .vcard a { -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; -} - -.notice div.entry-content { -clear:left; -float:left; -font-size:0.95em; -margin-left:59px; -width:70%; -} -#showstream .notice div.entry-content { -margin-left:0; -} - -.notice .notice-options a, -.notice .notice-options input { -float:left; -font-size:1.025em; -} - -.notice div.entry-content dl, -.notice div.entry-content dt, -.notice div.entry-content dd { -display:inline; -} - -.notice div.entry-content .timestamp dt, -.notice div.entry-content .response dt { -display:none; -} -.notice div.entry-content .timestamp a { -display:inline-block; -} -.notice div.entry-content .device dt { -text-transform:lowercase; -} - - - -.notice-data { -position:absolute; -top:18px; -right:0; -min-height:50px; -margin-bottom:4px; -} -.notice .entry-content .notice-data dt { -display:none; -} - -.notice-data a { -display:block; -outline:none; -} - -.notice-options { -padding-left:2%; -float:left; -width:50%; -position:relative; -font-size:0.95em; -width:12.5%; -float:right; -} - -.notice-options a { -float:left; -} -.notice-options .notice_delete, -.notice-options .notice_reply, -.notice-options .form_favor, -.notice-options .form_disfavor { -position:absolute; -top:0; -} -.notice-options .form_favor, -.notice-options .form_disfavor { -left:0; -} -.notice-options .notice_reply { -left:29px; -} -.notice-options .notice_delete { -right:0; -} -.notice-options .notice_reply dt { -display:none; -} - -.notice-options input, -.notice-options a { -text-indent:-9999px; -outline:none; -} - -.notice-options .notice_reply a, -.notice-options input.submit { -display:block; -border:0; -} -.notice-options .notice_reply a, -.notice-options .notice_delete a { -text-decoration:none; -padding-left:16px; -} - -.notice-options form input.submit { -width:16px; -padding:2px 0; -} - -.notice-options .notice_delete dt, -.notice-options .form_favor legend, -.notice-options .form_disfavor legend { -display:none; -} -.notice-options .notice_delete fieldset, -.notice-options .form_favor fieldset, -.notice-options .form_disfavor fieldset { -border:0; -padding:0; -} - - -#usergroups #new_group { -float: left; -margin-right: 2em; -} -#new_group, #group_search { -margin-bottom:18px; -} -#new_group a { -padding-left:20px; -} - - -#filter_tags { -margin-bottom:11px; -float:left; -} -#filter_tags dt { -display:none; -} -#filter_tags ul { -list-style-type:none; -} -#filter_tags ul li { -float:left; -margin-left:7px; -padding-left:7px; -border-left-width:1px; -border-left-style:solid; -} -#filter_tags ul li.child_1 { -margin-left:0; -border-left:0; -padding-left:0; -} -#filter_tags ul li#filter_tags_all a { -font-weight:bold; -margin-top:7px; -float:left; -} - -#filter_tags ul li#filter_tags_item label { -margin-right:7px; -} -#filter_tags ul li#filter_tags_item label, -#filter_tags ul li#filter_tags_item select { -display:inline; -} -#filter_tags ul li#filter_tags_item p { -float:left; -margin-left:38px; -} -#filter_tags ul li#filter_tags_item input { -position:relative; -top:3px; -left:3px; -} - - - -.pagination { -float:left; -clear:both; -width:100%; -margin-top:18px; -} - -.pagination dt { -font-weight:bold; -display:none; -} - -.pagination .nav { -float:left; -width:100%; -list-style-type:none; -} - -.pagination .nav_prev { -float:left; -} -.pagination .nav_next { -float:right; -} - -.pagination a { -display:block; -text-decoration:none; -font-weight:bold; -padding:7px; -border-width:1px; -border-style:solid; --moz-border-radius:7px; --webkit-border-radius:7px; -border-radius:7px; -} - -.pagination .nav_prev a { -padding-left:30px; -} -.pagination .nav_next a { -padding-right:30px; -} -/* END: NOTICE */ - - -.hentry .entry-content p { -margin-bottom:18px; -} -.hentry entry-content ol, -.hentry .entry-content ul { -list-style-position:inside; -} -.hentry .entry-content li { -margin-bottom:18px; -} -.hentry .entry-content li li { -margin-left:18px; -} - - - - -/* TOP_POSTERS */ -.section tbody td { -padding-right:11px; -padding-bottom:11px; -} -.section .vcard .photo { -margin-right:7px; -margin-bottom:0; -} - -.section .notice { -padding-top:7px; -padding-bottom:7px; -border-top:0; -} - -.section .notice:first-child { -padding-top:0; -} - -.section .notice .author { -margin-right:0; -} -.section .notice .author .fn { -display:none; -} - - -/* tagcloud */ -.tag-cloud { -list-style-type:none; -text-align:center; -} -.aside .tag-cloud { -font-size:0.8em; -} -.tag-cloud li { -display:inline; -margin-right:7px; -line-height:1.25; -} -.aside .tag-cloud li { -line-height:1.5; -} -.tag-cloud li a { -text-decoration:none; -} -#tagcloud.section dt { -text-transform:uppercase; -font-weight:bold; -} -.tag-cloud-1 { -font-size:1em; -} -.tag-cloud-2 { -font-size:1.25em; -} -.tag-cloud-3 { -font-size:1.75em; -} -.tag-cloud-4 { -font-size:2em; -} -.tag-cloud-5 { -font-size:2.25em; -} -.tag-cloud-6 { -font-size:2.75em; -} -.tag-cloud-7 { -font-size:3.25em; -} - -#publictagcloud #tagcloud.section dt { -display:none; -} - -#form_settings_photo .form_data { -clear:both; -} - -#form_settings_avatar li { -width:auto; -} -#form_settings_avatar input { -margin-left:0; -} -#avatar_original, -#avatar_preview { -float:left; -} -#avatar_preview { -margin-left:29px; -} -#avatar_preview_view { -height:96px; -width:96px; -margin-bottom:18px; -overflow:hidden; -} - -#settings_attach, -#form_settings_avatar .form_actions { -clear:both; -} - -#form_settings_avatar .form_actions { -margin-bottom:0; -} - -#form_settings_design #settings_design_color .form_data, -#form_settings_design #color-picker { -float:left; -} -#form_settings_design #settings_design_color .form_data { -width:400px; -margin-right:28px; -} - -.instructions ul { -list-style-position:inside; -} -.instructions p, -.instructions ul { -margin-bottom:18px; -} -.help dt { -display:none; -} -.guide { -clear:both; -} diff --git a/theme/default/base/css/facebookapp.css b/theme/default/base/css/facebookapp.css deleted file mode 100644 index 163b41fb4..000000000 --- a/theme/default/base/css/facebookapp.css +++ /dev/null @@ -1,100 +0,0 @@ -@import url("display.css"); -@import url("../../identica/css/display.css"); - -* { -font-size:14px; -font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; -} - -#wrap { -background-color:#F0F2F5; -padding-left:18px; -padding-right:18px; -width:auto; -} - -p,label, -h1,h2,h3,h4,h5,h6 { -color:#000; -} - -#content { -width:95%; -} - -#site_nav_local_views a { -background-color:#D0DFE7; -} -#site_nav_local_views a:hover { -background-color:#FAFBFC; -} - -span.facebook-button { -border: 2px solid #aaa; -padding: 3px; -display: block; -float: left; -margin-right: 20px; --moz-border-radius: 4px; -border-radius:4px; --webkit-border-radius:4px; -font-weight: bold; -background-color:#A9BF4F; -color:#fff; -font-size:1.2em -} - -span.facebook-button a { color:#fff } - -.facebook_guide { -margin-bottom:18px; -} -.facebook_guide p { -font-weight:bold; -} - - -input { -height:auto !important; -} - -#facebook-friends { -float:left; -width:100%; -} - -#facebook-friends li { -float:left; -margin-right:2%; -margin-bottom:11px; -width:18%; -height:115px; -} -#facebook-friends li a { -float:left; -} - -#add_to_profile { -position:absolute; -right:18px; -top:10px; -z-index:2; -} - -.notice div.entry-content dl, -.notice div.entry-content dt, -.notice div.entry-content dd { -margin-right:5px; -} - -#content_inner p { -margin-bottom:18px; -} - -#content_inner ul { -list-style-type:none; -} - -.form_settings label { -margin-right:18px; -} diff --git a/theme/default/base/css/farbtastic.css b/theme/default/base/css/farbtastic.css deleted file mode 100644 index 3b8fec58f..000000000 --- a/theme/default/base/css/farbtastic.css +++ /dev/null @@ -1,32 +0,0 @@ -.farbtastic { - position: relative; -} -.farbtastic * { - position: absolute; - cursor: crosshair; -} -.farbtastic, .farbtastic .wheel { - width: 195px; - height: 195px; -} -.farbtastic .color, .farbtastic .overlay { - top: 47px; - left: 47px; - width: 101px; - height: 101px; -} -.farbtastic .wheel { - background: url(../../../../js/farbtastic/wheel.png) no-repeat; - width: 195px; - height: 195px; -} -.farbtastic .overlay { - background: url(../../../../js/farbtastic/mask.png) no-repeat; -} -.farbtastic .marker { - width: 17px; - height: 17px; - margin: -8px 0 0 -8px; - overflow: hidden; - background: url(../../../../js/farbtastic/marker.png) no-repeat; -} diff --git a/theme/default/base/css/ie.css b/theme/default/base/css/ie.css deleted file mode 100644 index 5d8bea8ae..000000000 --- a/theme/default/base/css/ie.css +++ /dev/null @@ -1,32 +0,0 @@ -/* IE specific styles */ -legend { -margin-left:-7px; -} -input.checkbox { -top:0; -} -#form_notice textarea { -width:78%; -} -#form_notice #notice_action-submit { -width:17%; -max-width:17%; -} -#anon_notice { -max-width:39%; -} - -.notice-options input.submit { -font-size:0; -margin-top:3px; -height:16px; -text-align:right; -text-indent:0; -width:24px; -} -.notice div.entry-content .timestamp a { -margin-right:4px; -} -.entity_profile { -width:64%; -} diff --git a/theme/default/base/css/ie6.css b/theme/default/base/css/ie6.css deleted file mode 100644 index 76a82c004..000000000 --- a/theme/default/base/css/ie6.css +++ /dev/null @@ -1,30 +0,0 @@ -/* IE6 specific styles */ -address { -margin-left:7px; -} -address .fn { -display:none; -} -#content { -width:70%; -} -#aside_primary { -padding:5%; -width:29.5%; -} -.entity_profile .entity_nickname, -.entity_profile .entity_location, -.entity_profile .entity_url, -.entity_profile .entity_note, -.entity_profile .entity_tags { -margin-left:0; -} -.entity_profile .entity_depiction { -margin-bottom:123px; -} -.entity_actions { -width:20%; -} -.notice div.entry-content { -width:63%; -} diff --git a/theme/default/base/css/jquery.Jcrop.css b/theme/default/base/css/jquery.Jcrop.css deleted file mode 100644 index 6c6dfb503..000000000 --- a/theme/default/base/css/jquery.Jcrop.css +++ /dev/null @@ -1,45 +0,0 @@ -/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */ -.jcrop-holder -{ - text-align: left; -} - -.jcrop-vline, .jcrop-hline -{ - font-size: 0; - position: absolute; - background: #fff url(../images/illustrations/illu_jcrop.gif) top left repeat; - /* - opacity: .5; - *filter:alpha(opacity=50); - */ -} -.jcrop-vline { height: 100%; width: 1px !important; } -.jcrop-hline { width: 100%; height: 1px !important; } -.jcrop-handle { - font-size: 1px; - width: 7px !important; - height: 7px !important; - border: 1px #eee solid; - background-color: #333; - /*width: 9px; - height: 9px;*/ -} - -.jcrop-tracker { - /*background-color: gray;*/ - width: 100%; height: 100%; -} - -.custom .jcrop-vline, -.custom .jcrop-hline -{ - background: yellow; -} -.custom .jcrop-handle -{ - border-color: black; - background-color: #C7BB00; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; -} diff --git a/theme/default/base/css/mobile.css b/theme/default/base/css/mobile.css deleted file mode 100644 index eee98317c..000000000 --- a/theme/default/base/css/mobile.css +++ /dev/null @@ -1,150 +0,0 @@ -/** theme: base - * - * @package Laconica - * @author Meitar Moscovitz - * @author Sarven Capadisli - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ - */ - -body { -font-size:2.5em; -} - -#wrap { -width:95%; -} - -#header, -#header address, -#anon_notice, -#site_nav_local_views .nav, -#form_notice, -#form_notice .form_data li, -#core, -#content_inner, -#notices_primary, -.notice, -.notice .entry-title, -.notice div.entry-content, -.notice-options, -.notice .notice-options a, -.pagination, -.pagination .nav, -.aside .section { -float:none; -} - -.notice-options .notice_reply, -.notice-options .notice_delete, -.notice-options .form_favor, -.notice-options .form_disfavor { -position:static; -} - -#form_notice, -#anon_notice, -#footer, -#form_notice .form_actions input.submit { -width:auto; -} - -.form_settings label { -width:25%; -} -.form_settings .form_data p.form_guide { -margin-left:26%; -} - -#site_nav_global_primary { -width:75%; -} - -.entity_profile { -width:65%; -} -.entity_actions { -margin-left:0; -} - -#form_notice, -#anon_notice { -clear:both; -} - -#content, -#aside_primary { -width:96%; -padding-left:2%; -padding-right:2%; -} - -#site_notice { -position:static; -float:right; -clear:right; -width:75%; -margin-right:0; -margin-bottom:11px; -} - -.notices { -font-size:1.5em; -} - -#form_notice textarea { -width:80%; -height:5em; -} -#form_notice .form_note { -right:20%; -top:6em; -} - - -.vcard .photo, -.section .vcard .photo { -margin-right:18px; -} -.notice, -.profile { -margin-bottom:18px; -} - -.notices .entry-title, -.notices div.entry-content { -width:90%; -} -.notice div.entry-content { -margin-left:0; -} - -.notice .author .photo { -height:4.5em; -width:4.5em; -} -.notice-options { -position:absolute; -top:0; -right:0; -padding-left:7%; -width:3%; -} - -.notice-options .notice_delete a { -float:left; -} -.pagination .nav { -overflow:auto; -} - -#export_data { -display:none; -} - -#site_nav_local_views li { -margin-right:4px; -} -#site_nav_local_views a { -padding:18px 11px; -} diff --git a/theme/default/base/css/print.css b/theme/default/base/css/print.css deleted file mode 100644 index d76dd608c..000000000 --- a/theme/default/base/css/print.css +++ /dev/null @@ -1,36 +0,0 @@ -/** theme: base - * - * @package Laconica - * @author Sarven Capadisli - * @copyright 2009 Control Yourself, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ - */ - -a:after { background-color:#fff; } -a:not([href^="#"]):after { content:" ( "attr(href)" ) "; } - -img { border:none; } -p { orphans: 2; widows: 1; } - -#site_nav_global_primary, -#site_nav_local_views, -#form_notice, -.pagination, -#site_nav_global_secondary, -.entity_actions, -.notice-options, -#aside_primary, -.form_subscription_edit .submit { -display:none; -} - -.timestamp dt, .timestamp dd, -.device dt, .device dd { -display:inline; -} - -.profiles li, -.notices li { -margin-bottom:18px; -} diff --git a/theme/default/base/css/thickbox.css b/theme/default/base/css/thickbox.css deleted file mode 100644 index d24b9bedf..000000000 --- a/theme/default/base/css/thickbox.css +++ /dev/null @@ -1,163 +0,0 @@ -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -*{padding: 0; margin: 0;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_window { - font: 12px Arial, Helvetica, sans-serif; - color: #333333; -} - -#TB_secondLine { - font: 10px Arial, Helvetica, sans-serif; - color:#666666; -} - -#TB_window a:link {color: #666666;} -#TB_window a:visited {color: #666666;} -#TB_window a:hover {color: #000;} -#TB_window a:active {color: #666666;} -#TB_window a:focus{color: #666666;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_overlay { - position: fixed; - z-index:100; - top: 0px; - left: 0px; - height:100%; - width:100%; -} - -.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} -.TB_overlayBG { - background-color:#000; - filter:alpha(opacity=75); - -moz-opacity: 0.75; - opacity: 0.75; -} - -* html #TB_overlay { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_window { - position: fixed; - background: #ffffff; - z-index: 102; - color:#000000; - display:none; - border: 4px solid #525252; - text-align:left; - top:50%; - left:50%; -} - -* html #TB_window { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_window img#TB_Image { - display:block; - margin: 15px 0 0 15px; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - border-top: 1px solid #666; - border-left: 1px solid #666; -} - -#TB_caption{ - height:25px; - padding:7px 30px 10px 25px; - float:left; -} - -#TB_closeWindow{ - height:25px; - padding:11px 25px 10px 0; - float:right; -} - -#TB_closeAjaxWindow{ - padding:7px 10px 5px 0; - margin-bottom:1px; - text-align:right; - float:right; -} - -#TB_ajaxWindowTitle{ - float:left; - padding:7px 0 5px 10px; - margin-bottom:1px; -} - -#TB_title{ - background-color:#e8e8e8; - height:27px; -} - -#TB_ajaxContent{ - clear:both; - padding:2px 15px 15px 15px; - overflow:auto; - text-align:left; - line-height:1.4em; -} - -#TB_ajaxContent.TB_modal{ - padding:15px; -} - -#TB_ajaxContent p{ - padding:5px 0px 5px 0px; -} - -#TB_load{ - position: fixed; - display:none; - height:13px; - width:208px; - z-index:103; - top: 50%; - left: 50%; - margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ -} - -* html #TB_load { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_HideSelect{ - z-index:99; - position:fixed; - top: 0; - left: 0; - background-color:#fff; - border:none; - filter:alpha(opacity=0); - -moz-opacity: 0; - opacity: 0; - height:100%; - width:100%; -} - -* html #TB_HideSelect { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_iframeContent{ - clear:both; - border:none; - margin-bottom:-1px; - margin-top:1px; - _margin-bottom:1px; -} diff --git a/theme/default/base/images/icons/icon_atom.png b/theme/default/base/images/icons/icon_atom.png deleted file mode 100644 index 6a001f11a..000000000 Binary files a/theme/default/base/images/icons/icon_atom.png and /dev/null differ diff --git a/theme/default/base/images/icons/icon_foaf.gif b/theme/default/base/images/icons/icon_foaf.gif deleted file mode 100644 index f8f784423..000000000 Binary files a/theme/default/base/images/icons/icon_foaf.gif and /dev/null differ diff --git a/theme/default/base/images/icons/icon_processing.gif b/theme/default/base/images/icons/icon_processing.gif deleted file mode 100644 index d0bce1542..000000000 Binary files a/theme/default/base/images/icons/icon_processing.gif and /dev/null differ diff --git a/theme/default/base/images/icons/icon_rss.png b/theme/default/base/images/icons/icon_rss.png deleted file mode 100644 index 0ccd1ce25..000000000 Binary files a/theme/default/base/images/icons/icon_rss.png and /dev/null differ diff --git a/theme/default/base/images/icons/icon_vcard.gif b/theme/default/base/images/icons/icon_vcard.gif deleted file mode 100644 index 6d52947f3..000000000 Binary files a/theme/default/base/images/icons/icon_vcard.gif and /dev/null differ diff --git a/theme/default/base/images/illustrations/illu_jcrop.gif b/theme/default/base/images/illustrations/illu_jcrop.gif deleted file mode 100644 index 72ea7ccb5..000000000 Binary files a/theme/default/base/images/illustrations/illu_jcrop.gif and /dev/null differ diff --git a/theme/default/base/images/illustrations/illu_progress_loading-01.gif b/theme/default/base/images/illustrations/illu_progress_loading-01.gif deleted file mode 100644 index 82290f483..000000000 Binary files a/theme/default/base/images/illustrations/illu_progress_loading-01.gif and /dev/null differ diff --git a/theme/default/css/display.css b/theme/default/css/display.css new file mode 100644 index 000000000..2f41a9843 --- /dev/null +++ b/theme/default/css/display.css @@ -0,0 +1,250 @@ +/** theme: default + * + * @package Laconica + * @author Sarven Capadisli + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +@import url(../../base/css/display.css); + +html, +body, +a:active { +background-color:#97BFD1; +} +body { +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +font-size:1em; +} +address { +margin-right:7.18%; +} + +input, textarea, select, option { +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +} +input, textarea, select, +.entity_remote_subscribe { +border-color:#aaa; +} +#filter_tags ul li { +border-color:#97BFD1; +} + +.form_settings input.form_action-secondary { +background:none; +} + +input.submit, +#form_notice.warning #notice_text-count, +.form_settings .form_note, +.entity_remote_subscribe { +background-color:#A9BF4F; +} + +input:focus, textarea:focus, select:focus, +#form_notice.warning #notice_data-text { +border-color:#A9BF4F; +} +input.submit, +.entity_remote_subscribe { +color:#fff; +} + +a, +div.notice-options input, +.form_user_block input.submit, +.form_user_unblock input.submit, +.entity_send-a-message a, +.form_user_nudge input.submit, +.entity_nudge p, +.form_settings input.form_action-secondary { +color:#002E6E; +} + +.notice, +.profile { +border-top-color:#D1D9E4; +} +.section .profile { +border-top-color:#97BFD1; +} + + +#content .notice p.entry-content a:visited { +background-color:#fcfcfc; +} +#content .notice p.entry-content .vcard a { +background-color:#fcfffc; +} + +#aside_primary { +background-color:#CEE1E9; +} + + +#notice_text-count { +color:#333; +} +#form_notice.warning #notice_text-count { +color:#000; +} +#form_notice.processing #notice_action-submit { +background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; +cursor:wait; +text-indent:-9999px; +} + +#content, +#site_nav_local_views a, +#aside_primary { +border-color:#fff; +} +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + +#site_nav_local_views a { +background-color:rgba(255, 255, 255, 0.2); +} +#site_nav_local_views a:hover { +background-color:rgba(255, 255, 255, 0.7); +} + + +.error { +background-color:#F7E8E8; +} +.success { +background-color:#EFF3DC; +} + + +#anon_notice { +background-color:#97BFD1; +color:#fff; +border-color:#fff; +} + +#showstream #anon_notice { +background-color:#A9BF4F; +} + + +#export_data li a { +background-repeat:no-repeat; +background-position:0 45%; +} +#export_data li a.rss { +background-image:url(../../base/images/icons/icon_rss.png); +} +#export_data li a.atom { +background-image:url(../../base/images/icons/icon_atom.png); +} +#export_data li a.foaf { +background-image:url(../../base/images/icons/icon_foaf.gif); +} + +.entity_edit a, +.entity_send-a-message a, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit, +.entity_nudge p { +background-position: 0 40%; +background-repeat: no-repeat; +background-color:transparent; +} +.form_group_join input.submit, +.form_group_leave input.submit +.form_user_subscribe input.submit, +.form_user_unsubscribe input.submit { +background-color:#A9BF4F; +color:#fff; +} +.form_user_unsubscribe input.submit, +.form_group_leave input.submit, +.form_user_authorization input.reject { +background-color:#97BFD1; +} + +.entity_edit a { +background-image:url(../../base/images/icons/twotone/green/edit.gif); +} +.entity_send-a-message a { +background-image:url(../../base/images/icons/twotone/green/quote.gif); +} +.entity_nudge p, +.form_user_nudge input.submit { +background-image:url(../../base/images/icons/twotone/green/mail.gif); +} +.form_user_block input.submit, +.form_user_unblock input.submit { +background-image:url(../../base/images/icons/twotone/green/shield.gif); +} + + + +/* NOTICES */ +.notices li.over { +background-color:#fcfcfc; +} + +.notice-options .notice_reply a, +.notice-options form input.submit { +background-color:transparent; +} +.notice-options .notice_reply a { +background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%; +} +.notice-options form.form_favor input.submit { +background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%; +} +.notice-options form.form_disfavor input.submit { +background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +} +.notice-options .notice_delete a { +background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%; +} + +.notices div.entry-content, +.notices div.notice-options { +opacity:0.4; +} +.notices li.hover div.entry-content, +.notices li.hover div.notice-options { +opacity:1; +} +div.entry-content { +color:#333; +} +div.notice-options a, +div.notice-options input { +font-family:sans-serif; +} +.notices li.hover { +background-color:#fcfcfc; +} +/*END: NOTICES */ + + +#new_group a { +background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%; +} + +.pagination .nav_prev a, +.pagination .nav_next a { +background-repeat:no-repeat; +border-color:#D1D9E4; +} +.pagination .nav_prev a { +background-image:url(../../base/images/icons/twotone/green/arrow-left.gif); +background-position:10% 45%; +} +.pagination .nav_next a { +background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); +background-position:90% 45%; +} diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css new file mode 100644 index 000000000..2b06768ea --- /dev/null +++ b/theme/default/css/ie.css @@ -0,0 +1,9 @@ +/* IE specific styles */ + +.notice-options input.submit { +color:#fff; +} + +#site_nav_local_views a { +background-color:#ACCCDA; +} diff --git a/theme/default/logo.png b/theme/default/logo.png deleted file mode 100644 index 7c68b34f6..000000000 Binary files a/theme/default/logo.png and /dev/null differ diff --git a/theme/default/skin/default/css/display.css b/theme/default/skin/default/css/display.css deleted file mode 100644 index e290c208b..000000000 --- a/theme/default/skin/default/css/display.css +++ /dev/null @@ -1,248 +0,0 @@ -/** theme: default - * - * @package Laconica - * @author Sarven Capadisli - * @copyright 2009 Control Yourself, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ - */ - -html, -body, -a:active { -background-color:#97BFD1; -} -body { -font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; -font-size:1em; -} -address { -margin-right:7.18%; -} - -input, textarea, select, option { -font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; -} -input, textarea, select, -.entity_remote_subscribe { -border-color:#aaa; -} -#filter_tags ul li { -border-color:#97BFD1; -} - -.form_settings input.form_action-secondary { -background:none; -} - -input.submit, -#form_notice.warning #notice_text-count, -.form_settings .form_note, -.entity_remote_subscribe { -background-color:#A9BF4F; -} - -input:focus, textarea:focus, select:focus, -#form_notice.warning #notice_data-text { -border-color:#A9BF4F; -} -input.submit, -.entity_remote_subscribe { -color:#fff; -} - -a, -div.notice-options input, -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_send-a-message a, -.form_user_nudge input.submit, -.entity_nudge p, -.form_settings input.form_action-secondary { -color:#002E6E; -} - -.notice, -.profile { -border-top-color:#D1D9E4; -} -.section .profile { -border-top-color:#97BFD1; -} - - -#content .notice p.entry-content a:visited { -background-color:#fcfcfc; -} -#content .notice p.entry-content .vcard a { -background-color:#fcfffc; -} - -#aside_primary { -background-color:#CEE1E9; -} - - -#notice_text-count { -color:#333; -} -#form_notice.warning #notice_text-count { -color:#000; -} -#form_notice.processing #notice_action-submit { -background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; -cursor:wait; -text-indent:-9999px; -} - -#content, -#site_nav_local_views a, -#aside_primary { -border-color:#fff; -} -#content, -#site_nav_local_views .current a { -background-color:#fff; -} - -#site_nav_local_views a { -background-color:rgba(255, 255, 255, 0.2); -} -#site_nav_local_views a:hover { -background-color:rgba(255, 255, 255, 0.7); -} - - -.error { -background-color:#F7E8E8; -} -.success { -background-color:#EFF3DC; -} - - -#anon_notice { -background-color:#97BFD1; -color:#fff; -border-color:#fff; -} - -#showstream #anon_notice { -background-color:#A9BF4F; -} - - -#export_data li a { -background-repeat:no-repeat; -background-position:0 45%; -} -#export_data li a.rss { -background-image:url(../../../base/images/icons/icon_rss.png); -} -#export_data li a.atom { -background-image:url(../../../base/images/icons/icon_atom.png); -} -#export_data li a.foaf { -background-image:url(../../../base/images/icons/icon_foaf.gif); -} - -.entity_edit a, -.entity_send-a-message a, -.form_user_nudge input.submit, -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_nudge p { -background-position: 0 40%; -background-repeat: no-repeat; -background-color:transparent; -} -.form_group_join input.submit, -.form_group_leave input.submit -.form_user_subscribe input.submit, -.form_user_unsubscribe input.submit { -background-color:#A9BF4F; -color:#fff; -} -.form_user_unsubscribe input.submit, -.form_group_leave input.submit, -.form_user_authorization input.reject { -background-color:#97BFD1; -} - -.entity_edit a { -background-image:url(../images/icons/twotone/green/edit.gif); -} -.entity_send-a-message a { -background-image:url(../images/icons/twotone/green/quote.gif); -} -.entity_nudge p, -.form_user_nudge input.submit { -background-image:url(../images/icons/twotone/green/mail.gif); -} -.form_user_block input.submit, -.form_user_unblock input.submit { -background-image:url(../images/icons/twotone/green/shield.gif); -} - - - -/* NOTICES */ -.notices li.over { -background-color:#fcfcfc; -} - -.notice-options .notice_reply a, -.notice-options form input.submit { -background-color:transparent; -} -.notice-options .notice_reply a { -background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%; -} -.notice-options form.form_favor input.submit { -background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%; -} -.notice-options form.form_disfavor input.submit { -background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; -} -.notice-options .notice_delete a { -background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; -} - -.notices div.entry-content, -.notices div.notice-options { -opacity:0.4; -} -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { -opacity:1; -} -div.entry-content { -color:#333; -} -div.notice-options a, -div.notice-options input { -font-family:sans-serif; -} -.notices li.hover { -background-color:#fcfcfc; -} -/*END: NOTICES */ - - -#new_group a { -background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; -} - -.pagination .nav_prev a, -.pagination .nav_next a { -background-repeat:no-repeat; -border-color:#D1D9E4; -} -.pagination .nav_prev a { -background-image:url(../images/icons/twotone/green/arrow-left.gif); -background-position:10% 45%; -} -.pagination .nav_next a { -background-image:url(../images/icons/twotone/green/arrow-right.gif); -background-position:90% 45%; -} diff --git a/theme/default/skin/default/css/ie.css b/theme/default/skin/default/css/ie.css deleted file mode 100644 index 2b06768ea..000000000 --- a/theme/default/skin/default/css/ie.css +++ /dev/null @@ -1,9 +0,0 @@ -/* IE specific styles */ - -.notice-options input.submit { -color:#fff; -} - -#site_nav_local_views a { -background-color:#ACCCDA; -} diff --git a/theme/default/skin/default/images/icons/icon_atom.jpg b/theme/default/skin/default/images/icons/icon_atom.jpg deleted file mode 100644 index 22853edc4..000000000 Binary files a/theme/default/skin/default/images/icons/icon_atom.jpg and /dev/null differ diff --git a/theme/default/skin/default/images/icons/icon_foaf.gif b/theme/default/skin/default/images/icons/icon_foaf.gif deleted file mode 100644 index f8f784423..000000000 Binary files a/theme/default/skin/default/images/icons/icon_foaf.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/icon_rss.jpg b/theme/default/skin/default/images/icons/icon_rss.jpg deleted file mode 100644 index da23422d0..000000000 Binary files a/theme/default/skin/default/images/icons/icon_rss.jpg and /dev/null differ diff --git a/theme/default/skin/default/images/icons/icon_vcard.gif b/theme/default/skin/default/images/icons/icon_vcard.gif deleted file mode 100644 index 6d52947f3..000000000 Binary files a/theme/default/skin/default/images/icons/icon_vcard.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/arrow-left.gif b/theme/default/skin/default/images/icons/twotone/green/arrow-left.gif deleted file mode 100644 index afed19084..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/arrow-left.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/arrow-right.gif b/theme/default/skin/default/images/icons/twotone/green/arrow-right.gif deleted file mode 100644 index ee1707ed9..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/arrow-right.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/disfavourite.gif b/theme/default/skin/default/images/icons/twotone/green/disfavourite.gif deleted file mode 100644 index 3946869ae..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/disfavourite.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/edit.gif b/theme/default/skin/default/images/icons/twotone/green/edit.gif deleted file mode 100644 index c746aca60..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/edit.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/favourite.gif b/theme/default/skin/default/images/icons/twotone/green/favourite.gif deleted file mode 100644 index d93515e37..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/favourite.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/mail.gif b/theme/default/skin/default/images/icons/twotone/green/mail.gif deleted file mode 100644 index 1084c862f..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/mail.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/news.gif b/theme/default/skin/default/images/icons/twotone/green/news.gif deleted file mode 100644 index 712c685dc..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/news.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/quote.gif b/theme/default/skin/default/images/icons/twotone/green/quote.gif deleted file mode 100644 index 4ba1f0c03..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/quote.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/reply.gif b/theme/default/skin/default/images/icons/twotone/green/reply.gif deleted file mode 100644 index 6ff01bb35..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/reply.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/shield.gif b/theme/default/skin/default/images/icons/twotone/green/shield.gif deleted file mode 100644 index 419d5ee4b..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/shield.gif and /dev/null differ diff --git a/theme/default/skin/default/images/icons/twotone/green/trash.gif b/theme/default/skin/default/images/icons/twotone/green/trash.gif deleted file mode 100644 index 78dd64a3d..000000000 Binary files a/theme/default/skin/default/images/icons/twotone/green/trash.gif and /dev/null differ diff --git a/theme/default/skin/identica/css/display.css b/theme/default/skin/identica/css/display.css deleted file mode 100644 index a44b8cdd7..000000000 --- a/theme/default/skin/identica/css/display.css +++ /dev/null @@ -1,248 +0,0 @@ -/** theme: identica - * - * @package Laconica - * @author Sarven Capadisli - * @copyright 2009 Control Yourself, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ - */ - -html, -body, -a:active { -background-color:#F0F2F5; -} -body { -font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; -font-size:1em; -} -address { -margin-right:7.18%; -} - -input, textarea, select, option { -font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; -} -input, textarea, select, -.entity_remote_subscribe { -border-color:#aaa; -} -#filter_tags ul li { -border-color:#ddd; -} - -.form_settings input.form_action-secondary { -background:none; -} - -input.submit, -#form_notice.warning #notice_text-count, -.form_settings .form_note, -.entity_remote_subscribe { -background-color:#9BB43E; -} - -input:focus, textarea:focus, select:focus, -#form_notice.warning #notice_data-text { -border-color:#9BB43E; -} -input.submit, -.entity_remote_subscribe { -color:#fff; -} - -a, -div.notice-options input, -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_send-a-message a, -.form_user_nudge input.submit, -.entity_nudge p, -.form_settings input.form_action-secondary { -color:#002E6E; -} - -.notice, -.profile { -border-top-color:#CEE1E9; -} -.section .profile { -border-top-color:#87B4C8; -} - - -#content .notice p.entry-content a:visited { -background-color:#fcfcfc; -} -#content .notice p.entry-content .vcard a { -background-color:#fcfffc; -} - -#aside_primary { -background-color:#CEE1E9; -} - - -#notice_text-count { -color:#333; -} -#form_notice.warning #notice_text-count { -color:#000; -} -#form_notice.processing #notice_action-submit { -background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; -cursor:wait; -text-indent:-9999px; -} - -#content, -#site_nav_local_views a, -#aside_primary { -border-color:#fff; -} -#content, -#site_nav_local_views .current a { -background-color:#fff; -} - -#site_nav_local_views a { -background-color:rgba(135, 180, 200, 0.3); -} -#site_nav_local_views a:hover { -background-color:rgba(255, 255, 255, 0.7); -} - - -.error { -background-color:#F7E8E8; -} -.success { -background-color:#EFF3DC; -} - - -#anon_notice { -background-color:#87B4C8; -color:#fff; -border-color:#fff; -} - -#showstream #anon_notice { -background-color:#9BB43E; -} - - -#export_data li a { -background-repeat:no-repeat; -background-position:0 45%; -} -#export_data li a.rss { -background-image:url(../../../base/images/icons/icon_rss.png); -} -#export_data li a.atom { -background-image:url(../../../base/images/icons/icon_atom.png); -} -#export_data li a.foaf { -background-image:url(../../../base/images/icons/icon_foaf.gif); -} - -.entity_edit a, -.entity_send-a-message a, -.form_user_nudge input.submit, -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_nudge p { -background-position: 0 40%; -background-repeat: no-repeat; -background-color:transparent; -} -.form_group_join input.submit, -.form_group_leave input.submit -.form_user_subscribe input.submit, -.form_user_unsubscribe input.submit { -background-color:#9BB43E; -color:#fff; -} -.form_user_unsubscribe input.submit, -.form_group_leave input.submit, -.form_user_authorization input.reject { -background-color:#87B4C8; -} - -.entity_edit a { -background-image:url(../images/icons/twotone/green/edit.gif); -} -.entity_send-a-message a { -background-image:url(../images/icons/twotone/green/quote.gif); -} -.entity_nudge p, -.form_user_nudge input.submit { -background-image:url(../images/icons/twotone/green/mail.gif); -} -.form_user_block input.submit, -.form_user_unblock input.submit { -background-image:url(../images/icons/twotone/green/shield.gif); -} - - - -/* NOTICES */ -.notices li.over { -background-color:#fcfcfc; -} - -.notice-options .notice_reply a, -.notice-options form input.submit { -background-color:transparent; -} -.notice-options .notice_reply a { -background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%; -} -.notice-options form.form_favor input.submit { -background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%; -} -.notice-options form.form_disfavor input.submit { -background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; -} -.notice-options .notice_delete a { -background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%; -} - -.notices div.entry-content, -.notices div.notice-options { -opacity:0.4; -} -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { -opacity:1; -} -div.entry-content { -color:#333; -} -div.notice-options a, -div.notice-options input { -font-family:sans-serif; -} -.notices li.hover { -background-color:#fcfcfc; -} -/*END: NOTICES */ - - -#new_group a { -background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; -} - -.pagination .nav_prev a, -.pagination .nav_next a { -background-repeat:no-repeat; -border-color:#CEE1E9; -} -.pagination .nav_prev a { -background-image:url(../images/icons/twotone/green/arrow-left.gif); -background-position:10% 45%; -} -.pagination .nav_next a { -background-image:url(../images/icons/twotone/green/arrow-right.gif); -background-position:90% 45%; -} diff --git a/theme/default/skin/identica/css/ie.css b/theme/default/skin/identica/css/ie.css deleted file mode 100644 index 2f463bb44..000000000 --- a/theme/default/skin/identica/css/ie.css +++ /dev/null @@ -1,9 +0,0 @@ -/* IE specific styles */ - -.notice-options input.submit { -color:#fff; -} - -#site_nav_local_views a { -background-color:#D0DFE7; -} diff --git a/theme/default/skin/identica/images/icons/icon_atom.jpg b/theme/default/skin/identica/images/icons/icon_atom.jpg deleted file mode 100644 index 22853edc4..000000000 Binary files a/theme/default/skin/identica/images/icons/icon_atom.jpg and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/icon_foaf.gif b/theme/default/skin/identica/images/icons/icon_foaf.gif deleted file mode 100644 index f8f784423..000000000 Binary files a/theme/default/skin/identica/images/icons/icon_foaf.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/icon_rss.jpg b/theme/default/skin/identica/images/icons/icon_rss.jpg deleted file mode 100644 index da23422d0..000000000 Binary files a/theme/default/skin/identica/images/icons/icon_rss.jpg and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/icon_vcard.gif b/theme/default/skin/identica/images/icons/icon_vcard.gif deleted file mode 100644 index 6d52947f3..000000000 Binary files a/theme/default/skin/identica/images/icons/icon_vcard.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/arrow-left.gif b/theme/default/skin/identica/images/icons/twotone/green/arrow-left.gif deleted file mode 100644 index afed19084..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/arrow-left.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/arrow-right.gif b/theme/default/skin/identica/images/icons/twotone/green/arrow-right.gif deleted file mode 100644 index ee1707ed9..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/arrow-right.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/disfavourite.gif b/theme/default/skin/identica/images/icons/twotone/green/disfavourite.gif deleted file mode 100644 index 3946869ae..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/disfavourite.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/edit.gif b/theme/default/skin/identica/images/icons/twotone/green/edit.gif deleted file mode 100644 index c746aca60..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/edit.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/favourite.gif b/theme/default/skin/identica/images/icons/twotone/green/favourite.gif deleted file mode 100644 index d93515e37..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/favourite.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/mail.gif b/theme/default/skin/identica/images/icons/twotone/green/mail.gif deleted file mode 100644 index 1084c862f..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/mail.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/news.gif b/theme/default/skin/identica/images/icons/twotone/green/news.gif deleted file mode 100644 index 712c685dc..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/news.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/quote.gif b/theme/default/skin/identica/images/icons/twotone/green/quote.gif deleted file mode 100644 index 4ba1f0c03..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/quote.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/reply.gif b/theme/default/skin/identica/images/icons/twotone/green/reply.gif deleted file mode 100644 index 6ff01bb35..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/reply.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/shield.gif b/theme/default/skin/identica/images/icons/twotone/green/shield.gif deleted file mode 100644 index 419d5ee4b..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/shield.gif and /dev/null differ diff --git a/theme/default/skin/identica/images/icons/twotone/green/trash.gif b/theme/default/skin/identica/images/icons/twotone/green/trash.gif deleted file mode 100644 index 78dd64a3d..000000000 Binary files a/theme/default/skin/identica/images/icons/twotone/green/trash.gif and /dev/null differ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css new file mode 100644 index 000000000..a96118897 --- /dev/null +++ b/theme/identica/css/display.css @@ -0,0 +1,250 @@ +/** theme: identica + * + * @package Laconica + * @author Sarven Capadisli + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +@import url(../../base/css/display.css); + +html, +body, +a:active { +background-color:#F0F2F5; +} +body { +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +font-size:1em; +} +address { +margin-right:7.18%; +} + +input, textarea, select, option { +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +} +input, textarea, select, +.entity_remote_subscribe { +border-color:#aaa; +} +#filter_tags ul li { +border-color:#ddd; +} + +.form_settings input.form_action-secondary { +background:none; +} + +input.submit, +#form_notice.warning #notice_text-count, +.form_settings .form_note, +.entity_remote_subscribe { +background-color:#9BB43E; +} + +input:focus, textarea:focus, select:focus, +#form_notice.warning #notice_data-text { +border-color:#9BB43E; +} +input.submit, +.entity_remote_subscribe { +color:#fff; +} + +a, +div.notice-options input, +.form_user_block input.submit, +.form_user_unblock input.submit, +.entity_send-a-message a, +.form_user_nudge input.submit, +.entity_nudge p, +.form_settings input.form_action-secondary { +color:#002E6E; +} + +.notice, +.profile { +border-top-color:#CEE1E9; +} +.section .profile { +border-top-color:#87B4C8; +} + + +#content .notice p.entry-content a:visited { +background-color:#fcfcfc; +} +#content .notice p.entry-content .vcard a { +background-color:#fcfffc; +} + +#aside_primary { +background-color:#CEE1E9; +} + + +#notice_text-count { +color:#333; +} +#form_notice.warning #notice_text-count { +color:#000; +} +#form_notice.processing #notice_action-submit { +background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; +cursor:wait; +text-indent:-9999px; +} + +#content, +#site_nav_local_views a, +#aside_primary { +border-color:#fff; +} +#content, +#site_nav_local_views .current a { +background-color:#fff; +} + +#site_nav_local_views a { +background-color:rgba(135, 180, 200, 0.3); +} +#site_nav_local_views a:hover { +background-color:rgba(255, 255, 255, 0.7); +} + + +.error { +background-color:#F7E8E8; +} +.success { +background-color:#EFF3DC; +} + + +#anon_notice { +background-color:#87B4C8; +color:#fff; +border-color:#fff; +} + +#showstream #anon_notice { +background-color:#9BB43E; +} + + +#export_data li a { +background-repeat:no-repeat; +background-position:0 45%; +} +#export_data li a.rss { +background-image:url(../../base/images/icons/icon_rss.png); +} +#export_data li a.atom { +background-image:url(../../base/images/icons/icon_atom.png); +} +#export_data li a.foaf { +background-image:url(../../base/images/icons/icon_foaf.gif); +} + +.entity_edit a, +.entity_send-a-message a, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit, +.entity_nudge p { +background-position: 0 40%; +background-repeat: no-repeat; +background-color:transparent; +} +.form_group_join input.submit, +.form_group_leave input.submit +.form_user_subscribe input.submit, +.form_user_unsubscribe input.submit { +background-color:#9BB43E; +color:#fff; +} +.form_user_unsubscribe input.submit, +.form_group_leave input.submit, +.form_user_authorization input.reject { +background-color:#87B4C8; +} + +.entity_edit a { +background-image:url(../../base/images/icons/twotone/green/edit.gif); +} +.entity_send-a-message a { +background-image:url(../../base/images/icons/twotone/green/quote.gif); +} +.entity_nudge p, +.form_user_nudge input.submit { +background-image:url(../../base/images/icons/twotone/green/mail.gif); +} +.form_user_block input.submit, +.form_user_unblock input.submit { +background-image:url(../../base/images/icons/twotone/green/shield.gif); +} + + + +/* NOTICES */ +.notices li.over { +background-color:#fcfcfc; +} + +.notice-options .notice_reply a, +.notice-options form input.submit { +background-color:transparent; +} +.notice-options .notice_reply a { +background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%; +} +.notice-options form.form_favor input.submit { +background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%; +} +.notice-options form.form_disfavor input.submit { +background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +} +.notice-options .notice_delete a { +background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%; +} + +.notices div.entry-content, +.notices div.notice-options { +opacity:0.4; +} +.notices li.hover div.entry-content, +.notices li.hover div.notice-options { +opacity:1; +} +div.entry-content { +color:#333; +} +div.notice-options a, +div.notice-options input { +font-family:sans-serif; +} +.notices li.hover { +background-color:#fcfcfc; +} +/*END: NOTICES */ + + +#new_group a { +background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%; +} + +.pagination .nav_prev a, +.pagination .nav_next a { +background-repeat:no-repeat; +border-color:#CEE1E9; +} +.pagination .nav_prev a { +background-image:url(../../base/images/icons/twotone/green/arrow-left.gif); +background-position:10% 45%; +} +.pagination .nav_next a { +background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); +background-position:90% 45%; +} diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css new file mode 100644 index 000000000..2f463bb44 --- /dev/null +++ b/theme/identica/css/ie.css @@ -0,0 +1,9 @@ +/* IE specific styles */ + +.notice-options input.submit { +color:#fff; +} + +#site_nav_local_views a { +background-color:#D0DFE7; +} diff --git a/theme/identica/default-avatar-mini.png b/theme/identica/default-avatar-mini.png new file mode 100644 index 000000000..38b8692b4 Binary files /dev/null and b/theme/identica/default-avatar-mini.png differ diff --git a/theme/identica/default-avatar-profile.png b/theme/identica/default-avatar-profile.png new file mode 100644 index 000000000..f8357d4fc Binary files /dev/null and b/theme/identica/default-avatar-profile.png differ diff --git a/theme/identica/default-avatar-stream.png b/theme/identica/default-avatar-stream.png new file mode 100644 index 000000000..6b63baa70 Binary files /dev/null and b/theme/identica/default-avatar-stream.png differ diff --git a/theme/identica/logo.png b/theme/identica/logo.png new file mode 100644 index 000000000..7c68b34f6 Binary files /dev/null and b/theme/identica/logo.png differ -- cgit v1.2.3-54-g00ecf From d6a31c90a81a5e18af3379095bfccc444a5d7f73 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 14 Apr 2009 23:17:25 +0000 Subject: Removed skin config option --- config.php.sample | 1 - 1 file changed, 1 deletion(-) diff --git a/config.php.sample b/config.php.sample index 4c4c9f08b..b8ed45fa8 100644 --- a/config.php.sample +++ b/config.php.sample @@ -18,7 +18,6 @@ $config['site']['server'] = 'localhost'; $config['site']['path'] = 'laconica'; #$config['site']['fancy'] = false; #$config['site']['theme'] = 'default'; -#$config['site']['skin'] = 'default'; #To enable the built-in mobile style sheet, defaults to false. #$config['site']['mobile'] = true; #For contact email, defaults to $_SERVER["SERVER_ADMIN"] -- cgit v1.2.3-54-g00ecf From 64e4b8a20f5ec3fb4f1a4c68337ae40b1b0b0dcf Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 14 Apr 2009 23:32:09 +0000 Subject: Updated remaining files and styles for style separation for themes --- actions/avatarsettings.php | 2 +- actions/designsettings.php | 2 +- theme/base/css/farbtastic.css | 6 +++--- theme/base/images/icons/icon_processing.gif | Bin 0 -> 673 bytes theme/cloudy/css/display.css | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 theme/base/images/icons/icon_processing.gif diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 60f69b685..c2bb35a39 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -383,7 +383,7 @@ class AvatarsettingsAction extends AccountSettingsAction { parent::showStylesheets(); $jcropStyle = - common_path('theme/default/base/css/jquery.Jcrop.css?version='.LACONICA_VERSION); + common_path('theme/base/css/jquery.Jcrop.css?version='.LACONICA_VERSION); $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', diff --git a/actions/designsettings.php b/actions/designsettings.php index 05293f712..cdd950e78 100644 --- a/actions/designsettings.php +++ b/actions/designsettings.php @@ -196,7 +196,7 @@ class DesignsettingsAction extends AccountSettingsAction { parent::showStylesheets(); $farbtasticStyle = - common_path('theme/default/base/css/farbtastic.css?version='.LACONICA_VERSION); + common_path('theme/base/css/farbtastic.css?version='.LACONICA_VERSION); $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', diff --git a/theme/base/css/farbtastic.css b/theme/base/css/farbtastic.css index 3b8fec58f..7efcc73c3 100644 --- a/theme/base/css/farbtastic.css +++ b/theme/base/css/farbtastic.css @@ -16,17 +16,17 @@ height: 101px; } .farbtastic .wheel { - background: url(../../../../js/farbtastic/wheel.png) no-repeat; + background: url(../../../js/farbtastic/wheel.png) no-repeat; width: 195px; height: 195px; } .farbtastic .overlay { - background: url(../../../../js/farbtastic/mask.png) no-repeat; + background: url(../../../js/farbtastic/mask.png) no-repeat; } .farbtastic .marker { width: 17px; height: 17px; margin: -8px 0 0 -8px; overflow: hidden; - background: url(../../../../js/farbtastic/marker.png) no-repeat; + background: url(../../../js/farbtastic/marker.png) no-repeat; } diff --git a/theme/base/images/icons/icon_processing.gif b/theme/base/images/icons/icon_processing.gif new file mode 100644 index 000000000..d0bce1542 Binary files /dev/null and b/theme/base/images/icons/icon_processing.gif differ diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css index 151758b48..b87722eec 100644 --- a/theme/cloudy/css/display.css +++ b/theme/cloudy/css/display.css @@ -1328,7 +1328,7 @@ color:#333; color:#000; } #form_notice.processing #notice_action-submit { -background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; +background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; cursor:wait; text-indent:-9999px; } -- cgit v1.2.3-54-g00ecf From e876b74e8ba7e80edcb9a13bff15deff4aa6ff15 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 15 Apr 2009 08:38:05 +0200 Subject: Add license notice to install.php, replace short and asp style tags by more portable long tag form. --- install.php | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/install.php b/install.php index 0240349bb..87a99a650 100644 --- a/install.php +++ b/install.php @@ -1,4 +1,22 @@ -. + */ + define('INSTALLDIR', dirname(__FILE__)); function main() @@ -19,12 +37,12 @@ function checkPrereqs() { if (file_exists(INSTALLDIR.'/config.php')) { ?>

Config file "config.php" already exists.

-

Require PHP version 5 or greater.

Require PHP version 5 or greater.

Cannot load required extension "".

Cannot load required extension "".

Cannot write config file to "".

+ ?>

Cannot write config file to "".

On your server, try this command:

-
chmod a+w
- chmod a+w +

Cannot write avatar directory "/avatar/".

+ ?>

Cannot write avatar directory "/avatar/".

On your server, try this command:

-
chmod a+w /avatar/
+
chmod a+w /avatar/

Install Laconica

- +
- \ No newline at end of file + -- cgit v1.2.3-54-g00ecf From e8fc34e75c4c9684b8c7e03d471a905e08446618 Mon Sep 17 00:00:00 2001 From: Fil Date: Wed, 15 Apr 2009 10:35:15 +0200 Subject: Use preg_quote to fix http://laconi.ca/trac/ticket/1342 --- actions/noticesearch.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 095d0a454..0828e47d7 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -184,11 +184,11 @@ class SearchNoticeListItem extends NoticeListItem { function highlight($text, $terms) { /* Highligh search terms */ - $pattern = '/('.implode('|', array_map('htmlspecialchars', $terms)).')/i'; + $pattern = '/('.implode('|', array_map('preg_quote', array_map('htmlspecialchars', $terms))).')/i'; $result = preg_replace($pattern, '\\1', $text); /* Remove highlighting from inside links, loop incase multiple highlights in links */ - $pattern = '/(href="[^"]*)('.implode('|', array_map('htmlspecialchars', $terms)).')<\/strong>([^"]*")/iU'; + $pattern = '/(href="[^"]*)('.implode('|', array_map('preg_quote', array_map('htmlspecialchars', $terms))).')<\/strong>([^"]*")/iU'; do { $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count); } while ($count); -- cgit v1.2.3-54-g00ecf From 8439477201cd59a6c0dba84ddf48eb86a6154199 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 15 Apr 2009 13:29:52 +0200 Subject: Add escaping of /. --- actions/noticesearch.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 0828e47d7..d996998fc 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -184,11 +184,13 @@ class SearchNoticeListItem extends NoticeListItem { function highlight($text, $terms) { /* Highligh search terms */ - $pattern = '/('.implode('|', array_map('preg_quote', array_map('htmlspecialchars', $terms))).')/i'; + $options = implode('|', array_map('preg_quote', array_map('htmlspecialchars', $terms), + array_fill(0, sizeof($terms), '/'))); + $pattern = "/($options)/i"; $result = preg_replace($pattern, '\\1', $text); /* Remove highlighting from inside links, loop incase multiple highlights in links */ - $pattern = '/(href="[^"]*)('.implode('|', array_map('preg_quote', array_map('htmlspecialchars', $terms))).')<\/strong>([^"]*")/iU'; + $pattern = '/(href="[^"]*)('.$options.')<\/strong>([^"]*")/iU'; do { $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count); } while ($count); -- cgit v1.2.3-54-g00ecf From 8da76e0810342a90ac006f67cfd73500972f883a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 15 Apr 2009 10:05:16 -0400 Subject: add user id to statistics --- lib/profileaction.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/profileaction.php b/lib/profileaction.php index c81924e31..1f2e30994 100644 --- a/lib/profileaction.php +++ b/lib/profileaction.php @@ -179,6 +179,11 @@ class ProfileAction extends Action $this->element('h2', null, _('Statistics')); // Other stats...? + $this->elementStart('dl', 'entity_user-id'); + $this->element('dt', null, _('User ID')); + $this->element('dd', null, $this->profile->id); + $this->elementEnd('dl'); + $this->elementStart('dl', 'entity_member-since'); $this->element('dt', null, _('Member since')); $this->element('dd', null, date('j M Y', -- cgit v1.2.3-54-g00ecf From 7ba3f8aeb3277bec52eee896f0c6807c7121104c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 15 Apr 2009 11:30:33 -0400 Subject: script to trim very old notices from inboxes --- scripts/triminboxes.php | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 scripts/triminboxes.php diff --git a/scripts/triminboxes.php b/scripts/triminboxes.php new file mode 100644 index 000000000..0d2eaeaf0 --- /dev/null +++ b/scripts/triminboxes.php @@ -0,0 +1,83 @@ +#!/usr/bin/env php +. + */ + +# Abort if called from a web server +if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { + print "This script must be run from the command line\n"; + exit(1); +} + +ini_set("max_execution_time", "0"); +ini_set("max_input_time", "0"); +set_time_limit(0); +mb_internal_encoding('UTF-8'); + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); +define('LACONICA', true); + +require_once(INSTALLDIR . '/lib/common.php'); + +$user = new User(); +if ($argc > 1) { + $user->whereAdd('id > ' . $argv[1]); +} +$cnt = $user->find(); + +while ($user->fetch()) { + + $inbox_entry = new Notice_inbox(); + $inbox_entry->user_id = $user->id; + $inbox_entry->orderBy('created DESC'); + $inbox_entry->limit(1000, 1); + + $id = null; + + if ($inbox_entry->find(true)) { + $id = $inbox_entry->notice_id; + } + + $inbox_entry->free(); + unset($inbox_entry); + + if (is_null($id)) { + continue; + } + + $start = microtime(true); + + $old_inbox = new Notice_inbox(); + $cnt = $old_inbox->query('DELETE from notice_inbox WHERE user_id = ' . $user->id . ' AND notice_id < ' . $id); + $old_inbox->free(); + unset($old_inbox); + + print "Deleted $cnt notices for $user->nickname ($user->id).\n"; + + $finish = microtime(true); + + $delay = 3.0 * ($finish - $start); + + print "Delaying $delay seconds..."; + + // Wait to let slaves catch up + + usleep($delay * 1000000); + + print "DONE.\n"; +} -- cgit v1.2.3-54-g00ecf