Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

actions/invite.php

@@ -167,20 +167,27 @@ class InviteAction extends Action
     function showInviteForm()
     {
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'invite',
+                                           'id' => 'form_invite',
+                                           'class' => 'form_settings',
                                            'action' => common_local_url('invite')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, 'Send an invitation');
         $this->hidden('token', common_session_token());
 
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
         $this->textarea('addresses', _('Email addresses'),
                         $this->trimmed('addresses'),
                         _('Addresses of friends to invite (one per line)'));
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->textarea('personal', _('Personal message'),
                         $this->trimmed('personal'),
                         _('Optionally add a personal message to the invitation.'));
-
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('send', _('Send'));
-
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 

actions/noticesearch.php

@@ -8,6 +8,7 @@
  * @package  Laconica
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
  *
@@ -90,7 +91,7 @@ class NoticesearchAction extends SearchAction
         }
         if ($cnt > 0) {
             $terms = preg_split('/[\s,]+/', $q);
-            $this->elementStart('ul', array('id' => 'notices'));
+            $this->elementStart('ul', array('class' => 'notices'));
             for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
                 if ($notice->fetch()) {
                     $this->showNotice($notice, $terms);
@@ -147,23 +148,26 @@ class NoticesearchAction extends SearchAction
             return;
         }
         // XXX: RDFa
-        $this->elementStart('li', array('class' => 'notice_single',
+        $this->elementStart('li', array('class' => 'hentry notice',
                                           'id' => 'notice-' . $notice->id));
+
+        $this->elementStart('div', 'entry-title');
+        $this->elementStart('span', 'vcard author');
         $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
         $this->elementStart('a', array('href' => $profile->profileurl));
         $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
-                                    'class' => 'avatar stream',
+                                    'class' => 'avatar photo',
                                     'width' => AVATAR_STREAM_SIZE,
                                     'height' => AVATAR_STREAM_SIZE,
                                     'alt' =>
                                     ($profile->fullname) ? $profile->fullname :
                                     $profile->nickname));
+        $this->element('span', 'nickname fn', $profile->nickname);
         $this->elementEnd('a');
-        $this->element('a', array('href' => $profile->profileurl,
+        $this->elementEnd('span');
-                                  'class' => 'nickname'),
+
-                       $profile->nickname);
         // FIXME: URL, image, video, audio
-        $this->elementStart('p', array('class' => 'content'));
+        $this->elementStart('p', array('class' => 'entry-content'));
         if ($notice->rendered) {
             $this->raw($this->highlight($notice->rendered, $terms));
         } else {
@@ -173,20 +177,53 @@ class NoticesearchAction extends SearchAction
             $this->raw($this->highlight(common_render_content($notice->content, $notice), $terms));
         }
         $this->elementEnd('p');
+        $this->elementEnd('div');
+
         $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-        $this->elementStart('p', 'time');
+        $this->elementStart('div', 'entry-content');
-        $this->element('a', array('class' => 'permalink',
+        $this->elementStart('dl', 'timestamp');
-                                  'href' => $noticeurl,
+        $this->element('dt', null, _('Published'));
-                                  'title' => common_exact_date($notice->created)),
+        $this->elementStart('dd', null);
+        $this->elementStart('a', array('rel' => 'bookmark',
+                                       'href' => $noticeurl));
+        $dt = common_date_iso8601($notice->created);
+        $this->element('abbr', array('class' => 'published',
+                                          'title' => $dt),
                             common_date_string($notice->created));
+        $this->elementEnd('a');
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
+
         if ($notice->reply_to) {
-            $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+            $replyurl = common_local_url('shownotice',
-            $this->text(' (');
+                                         array('notice' => $this->notice->reply_to));
-            $this->element('a', array('class' => 'inreplyto',
+            $this->elementStart('dl', 'response');
-                                      'href' => $replyurl),
+            $this->element('dt', null, _('To'));
-                           _('in reply to...'));
+            $this->elementStart('dd');
-            $this->text(')');
+            $this->element('a', array('href' => $replyurl,
+                                           'rel' => 'in-reply-to'),
+                                _('in reply to'));
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
         }
+        $this->elementEnd('div');
+
+        $this->elementStart('div', 'notice-options');
+
+        $reply_url = common_local_url('newnotice',
+                                      array('replyto' => $profile->nickname));
+
+        $this->elementStart('dl', 'notice_reply');
+        $this->element('dt', null, _('Reply to this notice'));
+        $this->elementStart('dd');
+        $this->elementStart('a', array('href' => $reply_url,
+                                       'title' => _('Reply to this notice')));
+        $this->text(_('Reply'));
+        $this->element('span', 'notice_id', $notice->id);
+        $this->elementEnd('a');
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
+
         $this->elementStart('a',
                              array('href' => common_local_url('newnotice',
                                                               array('replyto' => $profile->nickname)),
@@ -194,10 +231,8 @@ class NoticesearchAction extends SearchAction
                                    'title' => _('reply'),
                                    'class' => 'replybutton'));
         $this->hidden('posttoken', common_session_token());
-        
-        $this->raw('&rarr;');
         $this->elementEnd('a');
-        $this->elementEnd('p');
+        $this->elementEnd('div');
         $this->elementEnd('li');
     }
 

actions/showstream.php

@@ -316,7 +316,7 @@ class ShowstreamAction extends Action
         $this->elementStart('div', 'entity_actions');
         $this->element('h2', null, _('User actions'));
         $this->elementStart('ul');
-        $this->elementStart('li', array('id' => 'entity_subscribe'));
+        $this->elementStart('li', array('class' => 'entity_subscribe'));
         $cur = common_current_user();
         if ($cur) {
             if ($cur->id != $this->profile->id) {
@@ -337,14 +337,14 @@ class ShowstreamAction extends Action
 
         $user = User::staticGet('id', $this->profile->id);
         if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
-           $this->elementStart('li', array('id' => 'entity_send-a-message'));
+           $this->elementStart('li', array('class' => 'entity_send-a-message'));
             $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)),
                                       'title' => _('Send a direct message to this user')),
                            _('Message'));
             $this->elementEnd('li');
 
             if ($user->email && $user->emailnotifynudge) {
-                $this->elementStart('li', array('id' => 'entity_nudge'));
+                $this->elementStart('li', array('class' => 'entity_nudge'));
                 $nf = new NudgeForm($this, $user);
                 $nf->show();
                 $this->elementEnd('li');
@@ -353,7 +353,7 @@ class ShowstreamAction extends Action
 
         if ($cur && $cur->id != $this->profile->id) {
             $blocked = $cur->hasBlocked($this->profile);
-            $this->elementStart('li', array('id' => 'entity_block'));
+            $this->elementStart('li', array('class' => 'entity_block'));
             if ($blocked) {
                 $ubf = new UnblockForm($this, $this->profile);
                 $ubf->show();

actions/twittersettings.php

@@ -104,18 +104,20 @@ class TwittersettingsAction extends ConnectSettingsAction
         $this->elementStart('fieldset', array('id' => 'settings_twitter_account'));
         $this->element('legend', null, _('Twitter Account'));
         $this->hidden('token', common_session_token());
-        $this->elementStart('ul', 'form_data');
         if ($fuser) {
-            $this->elementStart('li');
+            $this->elementStart('ul', 'form_data');
+            $this->elementStart('li', array('id' => 'settings_twitter_remove'));
             $this->element('span', 'twitter_user', $fuser->nickname);
             $this->element('a', array('href' => $fuser->uri), $fuser->uri);
             $this->element('p', 'form_guide',
                            _('Current verified Twitter account.'));
             $this->hidden('flink_foreign_id', $flink->foreign_id);
-            $this->submit('remove', _('Remove'));
             $this->elementEnd('li');
+            $this->elementEnd('ul');
+            $this->submit('remove', _('Remove'));
         } else {
-            $this->elementStart('li');
+            $this->elementStart('ul', 'form_data');
+            $this->elementStart('li', array('id' => 'settings_twitter_login'));
             $this->input('twitter_username', _('Twitter user name'),
                          ($this->arg('twitter_username')) ?
                          $this->arg('twitter_username') :
@@ -125,8 +127,8 @@ class TwittersettingsAction extends ConnectSettingsAction
             $this->elementStart('li');
             $this->password('twitter_password', _('Twitter password'));
             $this->elementend('li');
-        }
             $this->elementEnd('ul');
+        }
         $this->elementEnd('fieldset');
 
         $this->elementStart('fieldset',
@@ -224,10 +226,10 @@ class TwittersettingsAction extends ConnectSettingsAction
         $friends_count = count($friends);
 
         if ($friends_count > 0) {
-
+            $this->elementStart('div', array('id' => 'entity_subscriptions',
-            $this->element('h3', null, _('Twitter Friends'));
+                                             'class' => 'section'));
-            $this->elementStart('div', array('id' => 'subscriptions'));
+            $this->element('h2', null, _('Twitter Friends'));
-            $this->elementStart('ul', array('id' => 'subscriptions_avatars'));
+            $this->elementStart('ul', 'entities users xoxo');
 
             for ($i = 0; $i < min($friends_count, SUBSCRIPTIONS); $i++) {
 
@@ -238,13 +240,12 @@ class TwittersettingsAction extends ConnectSettingsAction
                     continue;
                 }
 
-                $this->elementStart('li');
+                $this->elementStart('li', 'vcard');
                 $this->elementStart('a', array('title' => ($other->fullname) ?
                                                $other->fullname :
                                                $other->nickname,
                                                'href' => $other->profileurl,
-                                               'rel' => 'contact',
+                                               'class' => 'url'));
-                                               'class' => 'subscription'));
 
                 $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
 
@@ -255,10 +256,12 @@ class TwittersettingsAction extends ConnectSettingsAction
                 $this->element('img', array('src' => $avatar_url,
                                             'width' => AVATAR_MINI_SIZE,
                                             'height' => AVATAR_MINI_SIZE,
-                                            'class' => 'avatar mini',
+                                            'class' => 'avatar photo',
                                             'alt' =>  ($other->fullname) ?
                                             $other->fullname :
                                             $other->nickname));
+                
+                $this->element('span', 'fn nickname', $other->nickname);
                 $this->elementEnd('a');
                 $this->elementEnd('li');
 

actions/usergroups.php

@@ -119,9 +119,11 @@ class UsergroupsAction extends Action
 
     function showContent()
     {
+        $this->elementStart('p', array('id' => 'new_group'));
         $this->element('a', array('href' => common_local_url('newgroup'),
-                                  'id' => 'new_group'),
+                                  'class' => 'more'),
                        _('Create a new group'));
+        $this->elementEnd('p');
 
         $offset = ($this->page-1) * GROUPS_PER_PAGE;
         $limit =  GROUPS_PER_PAGE + 1;

lib/facebookaction.php

@@ -95,21 +95,35 @@ class FacebookAction extends Action
   
     function showStylesheets()
     {
+        // Add a timestamp to the file so Facebook cache wont ignore our changes
+        $ts = filemtime(INSTALLDIR.'/theme/base/css/display.css');
         
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => getFacebookBaseCSS()));
+                                     'href' => theme_path('css/display.css', 'base') . '?ts=' . $ts));
+                                     
+        $theme = common_config('site', 'theme');
+        
+        $ts = filemtime(INSTALLDIR. '/theme/' . $theme .'/css/display.css');
                                      
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => getFacebookThemeCSS()));
+                                     'href' => theme_path('css/display.css', null) . '?ts=' . $ts));
+                                     
+        $ts = filemtime(INSTALLDIR.'/theme/base/css/facebookapp.css');
+        
+        $this->element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => theme_path('css/facebookapp.css', 'base') . '?ts=' . $ts));
     }
   
     function showScripts()
     {
+        // Add a timestamp to the file so Facebook cache wont ignore our changes
+        $ts = filemtime(INSTALLDIR.'/js/facebookapp.js');
+        
         $this->element('script', array('type' => 'text/javascript',
-                                       'src' => getFacebookJS()),
+                                       'src' => common_path('js/facebookapp.js') . '?ts=' . $ts));
-                       ' ');
     }
     
     /**

lib/facebookutil.php

@@ -32,7 +32,8 @@ function getFacebookNotices($since)
         'FROM notice ' .
         'JOIN foreign_link ' .
         'WHERE notice.profile_id = foreign_link.user_id ' .
-        'AND foreign_link.service = 2';
+        'AND foreign_link.service = 2 ' . 
+        'ORDER BY notice.created DESC';
 
     // XXX: What should the limit be?
     return Notice::getStreamDirect($qry, 0, 100, 0, 0, null, $since);
@@ -45,38 +46,6 @@ function getFacebook()
     return new Facebook($apikey, $secret);
 }
 
-function startFBML($indent = true)
-{
-    global $xw;
-    $xw = new XMLWriter();
-    $xw->openURI('php://output');
-    $xw->setIndent($indent);
-}
-
-function getFacebookBaseCSS()
-{
-    # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
-    $ts = filemtime(INSTALLDIR.'/theme/base/css/facebookapp.base.css');
-    $cssurl = theme_path('css/facebookapp.base.css', 'base') . "?ts=$ts";
-    return $cssurl;
-}
-
-function getFacebookThemeCSS() 
-{
-    # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
-    $ts = filemtime(theme_file('css/facebookapp.theme.css'));
-    $cssurl = theme_path('css/facebookapp.theme.css') . "?ts=$ts";
-    return $cssurl;   
-}
-
-function getFacebookJS() {
-
-    # Add a timestamp to the FBJS file so Facebook cache wont ignore our changes
-    $ts = filemtime(INSTALLDIR.'/js/facebookapp.js');
-    $jsurl = common_path('js/facebookapp.js') . "?ts=$ts";
-    return $jsurl;
-}
-
 function updateProfileBox($facebook, $flink, $notice) {
     $fbaction = new FacebookAction($output='php://output', $indent=true, $facebook, $flink);
     $fbaction->updateProfileBox($notice);

lib/searchaction.php

@@ -114,17 +114,21 @@ class SearchAction extends Action
         $q = $this->trimmed('q');
         $page = $this->trimmed('page', 1);
         $this->elementStart('form', array('method' => 'get',
-                                           'id' => 'login',
+                                           'id' => 'form_search',
+                                           'class' => 'form_settings',
                                            'action' => common_local_url($this->trimmed('action'))));
-        $this->elementStart('p');
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Search site'));
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
         if (!isset($config['site']['fancy']) || !$config['site']['fancy']) {
             $this->hidden('action', $this->trimmed('action'));
         }
-        $this->input('q', '', $q);
+        $this->input('q', 'Keyword(s)', $q);
-        $this->text(' ');
         $this->submit('search', 'Search');
-
+        $this->elementEnd('li');
-        $this->elementEnd('p');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
         if ($q) {
             $this->showResults($q, $page);

lib/searchgroupnav.php

@@ -82,7 +82,7 @@ class SearchGroupNav extends Widget
         $this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'),
             _('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice');
         $this->out->menuItem(common_local_url('groupsearch', $args), _('Group'),
-            _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_notice');
+            _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_group');
         $this->action->elementEnd('ul');
     }
 }

theme/base/css/display.css

@@ -61,6 +61,7 @@ border-radius:4px;
 
 input.submit {
 font-weight:bold;
+cursor:pointer;
 }
 textarea {
 overflow:auto;
@@ -120,6 +121,10 @@ float:left;
 margin-left:11px;
 float:left;
 }
+.form_settings .form_data input.submit {
+margin-left:0;
+}
+
 .form_settings label {
 margin-top:2px;
 width:152px;
@@ -146,7 +151,9 @@ font-weight:bold;
 #editgroup legend,
 #form_tag_user legend,
 #form_remote_subscribe legend,
-#form_openid_login legend {
+#form_openid_login legend,
+#form_search legend,
+#form_invite legend {
 display:none;
 }
 
@@ -175,7 +182,9 @@ width:90%;
 
 #form_login p.form_guide,
 #form_register #settings_rememberme p.form_guide,
-#form_openid_login #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;
 }
 
@@ -186,6 +195,11 @@ border-radius:4px;
 padding:0 7px;
 }
 
+#form_search .submit {
+margin-left:11px;
+}
+
+
 
 address {
 float:left;
@@ -361,7 +375,6 @@ margin-bottom:1em;
 
 #content {
 width:644px;
-width:46em;
 padding:18px;
 float:left;
 border-radius:7px;
@@ -378,11 +391,10 @@ float:left;
 }
 
 #aside_primary {
-width:300px;
+width:286px;
-width:21.429em;
 float:left;
 margin-left:2px;
-padding:18px 4px 18px 18px;
+padding:18px;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -453,7 +465,6 @@ top:25px;
 right:30px;
 margin-left:4px;
 padding:0;
-cursor:pointer;
 width:16px;
 height:16px;
 border:0;
@@ -586,11 +597,10 @@ display:none;
 .entity_actions input.submit {
 display:block;
 text-align:left;
-cursor:pointer;
 width:100%;
 }
 .entity_actions a,
-#entity_nudge p,
+.entity_nudge p,
 .entity_remote_subscribe {
 text-decoration:none;
 font-weight:bold;
@@ -599,15 +609,15 @@ display:block;
 
 .form_user_block input.submit,
 .form_user_unblock input.submit,
-#entity_send-a-message a,
+.entity_send-a-message a,
 .form_user_nudge input.submit,
-#entity_nudge p {
+.entity_nudge p {
 border:0;
 padding-left:20px;
 }
 
-#entity_send-a-message a,
+.entity_send-a-message a,
-#entity_nudge p {
+.entity_nudge p {
 padding:4px 4px 4px 23px;
 }
 
@@ -623,11 +633,11 @@ border-radius:4px;
 
 .entity_tags ul {
 list-style-type:none;
+display:inline;
 }
 .entity_tags li {
 display:inline;
-margin-right:1em;
+margin-right:4px;
-float:left;
 }
 
 .aside .section {
@@ -650,8 +660,8 @@ content: ":";
 }
 
 .section ul.entities {
-width:220px;
 float:left;
+width:100%;
 }
 .section .entities li {
 list-style-type:none;
@@ -750,7 +760,6 @@ border-radius:4px;
 #notices_primary {
 float:left;
 width:644px;
-width:46em;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -918,7 +927,6 @@ padding-left:16px;
 }
 
 .notice-options form input.submit {
-cursor:pointer;
 width:16px;
 padding:2px 0;
 }
@@ -938,14 +946,61 @@ padding:0;
 
 
 
-#groups p {
+#new_group {
 margin-bottom:18px;
 }
-#groups #new_group a {
+#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;

theme/base/css/facebookapp.base.css

@@ -1,285 +0,0 @@
-/* theme: identica */
-html {
-background-color:#ddd;
-}
-body {
-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-font-size:1em;
-background-color:#ddd;
-}
-input, textarea, select, option {
-font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-}
-input, textarea, select {
-border-color:#aaa;
-}
-
-input:focus, textarea:focus, select:focus {
-border-color:#A9BF4F;
-}
-input.submit {
-background-color:#A9BF4F;
-color:#fff;
-}
-
-a {
-color:#002E6E;
-}
-a:active {
-background-color:#ddd;
-}
-.notice p.entry-content a:visited {
-background-color:#fcfcfc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-.notice p.entry-content .vcard a {
-background-color:#fcfffc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-
-
-
-#aside_primary {
-background-color:#CEE1E9;
-}
-
-#form_notice textarea {
-}
-
-#form_notice label {
-color:#88171A;
-}
-#notice_text-count {
-color:#333;
-}
-#form_notice.warning #notice_text-count {
-color:#000;
-background-color:#A9BF4F;
-}
-#form_notice.warning #notice_data-text {
-border-color:#A9BF4F;
-}
-
-#form_notice #notice_data-attach_view {
-background-image:url(../images/icons/twotone/green/paper-clip.gif);
-background-repeat:no-repeat;
-background-position:0 45%;
-background-color:transparent;
-}
-
-
-#site_nav_global_primary a {
-}
-#form_notice .form_actions input.submit {
-}
-#nav_register a {
-background-color:#A9BF4F;
-color:#fff;
-text-decoration:none;
-font-weight:bold;
-padding:2px 4px;
-
-}
-#nav_login a {
-}
-
-
-#site_nav_local_views a {
-border-color:#fff;
-background-color:rgba(255, 255, 255, 0.2);
-}
-#site_nav_local_views a:hover {
-background-color:rgba(255, 255, 255, 0.7);
-}
-
-
-#content,
-#site_nav_local_views .current a {
-background-color:#fff;
-}
-
-
-#page_notice .error {
-background-color:#F7E8E8;
-}
-#page_notice .success {
-background-color:#EFF3DC;
-}
-
-#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.jpg);
-}
-#export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.jpg);
-}
-#export_data li a.foaf {
-background-image:url(../../base/images/icons/icon_foaf.gif);
-}
-#export_data li a.export_vcard {
-background-image:url(../../base/images/icons/icon_vcard.gif);
-}
-
-
-/*user_actions*/
-#user_actions li {
-border-top-color:#eee;
-}
-#user_actions a {
-color:#000;
-}
-#user_subscribe a,
-#TB_window input.submit,
-.form_user_subscribe input.submit {
-background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat;
-}
-.form_user_unsubscribe input.submit {
-background-color:#647819;
-color:#fff;
-}
-#user_send-a-message a {
-background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
-}
-.form_user_nudge input.submit {
-background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat;
-}
-.form_user_block input.submit {
-background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
-}
-
-
-.user_tags .mark_hash {
-color:#555;
-}
-
-
-
-.vcard .fn {
-}
-.vcard .fn:hover {
-}
-
-
-
-
-/* NOTICES */
-.notices li.over {
-background-color:#fcfcfc;
-}
-
-
-.notice div.entry-content a {
-
-}
-.notice div.entry-content a:hover {
-}
-
-
-.notice-data a span {
-background-color:transparent;
-background-repeat:no-repeat;
-background-position:0 45%;
-}
-.notice_video .notice-data a span {
-background-image:url(../images/icons/twotone/green/camera.gif);
-}
-.notice_audio .notice-data a span {
-background-image:url(../images/icons/twotone/green/music.gif);
-}
-.notice_image .notice-data a span {
-background-image:url(../images/icons/twotone/green/search.gif);
-}
-.notice_event .notice-data a span {
-background-image:url(../images/icons/twotone/green/calendar.gif);
-}
-.notice_location .notice-data a span {
-background-image:url(../images/icons/twotone/green/flag.gif);
-}
-.notice_document .notice-data a span {
-background-image:url(../images/icons/twotone/green/document.gif);
-}
-
-.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%;
-}
-
-div.notice-options {
-opacity:0.3;
-}
-
-div.entry-content {
-color:#333;
-}
-div.notice-options a,
-div.notice-options input {
-font-family:sans-serif;
-}
-div.notice-options input {
-color:#002E6E;
-
-}
-.notices li.hover {
-background-color:#fcfcfc;
-}
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
-opacity:1;
-}
-
-.form_settings .form_note {
-background-color:#A9BF4F;
-}
-
-/*END: NOTICES */
-
-
-
-.pagination .nav_prev a,
-.pagination .nav_next a {
-background-repeat:no-repeat;
-}
-.pagination .nav_prev a {
-background-image:url(../images/icons/twotone/green/arrow-left.gif);
-background-position:0 45%;
-}
-.pagination .nav_next a {
-background-image:url(../images/icons/twotone/green/arrow-right.gif);
-background-position:100% 45%;
-}
-
-
-
-#home #intro #guide_steps li a {
-border-color:#ccc;
-color:#fff;
-}
-#home #intro #step_join-now a {
-background-color:#f00;
-}
-#home #intro #step_start-a-group a {
-background-color:#0f0;
-}
-#home #intro #step_create-a-community a {
-background-color:#00f;
-}
-

theme/default/css/display.css

@@ -30,6 +30,9 @@ input, textarea, select,
 .entity_remote_subscribe {
 border-color:#aaa;
 }
+#filter_tags ul li {
+border-color:#97BFD1;
+}
 
 
 input.submit,
@@ -54,9 +57,9 @@ a,
 div.notice-options input,
 .form_user_block input.submit,
 .form_user_unblock input.submit,
-#entity_send-a-message a,
+.entity_send-a-message a,
 .form_user_nudge input.submit,
-#entity_nudge p {
+.entity_nudge p {
 color:#002E6E;
 }
 
@@ -160,11 +163,11 @@ background-image:url(../../base/images/icons/icon_vcard.gif);
 }
 
 
-#entity_send-a-message a,
+.entity_send-a-message a,
 .form_user_nudge input.submit,
 .form_user_block input.submit,
 .form_user_unblock input.submit,
-#entity_nudge p {
+.entity_nudge p {
 background-position: 0 40%;
 background-repeat: no-repeat;
 background-color:transparent;
@@ -181,10 +184,10 @@ color:#fff;
 background-color:#97BFD1;
 }
 
-#entity_send-a-message a {
+.entity_send-a-message a {
 background-image:url(../images/icons/twotone/green/quote.gif);
 }
-#entity_nudge p,
+.entity_nudge p,
 .form_user_nudge input.submit {
 background-image:url(../images/icons/twotone/green/mail.gif);
 }
@@ -262,7 +265,7 @@ background-color:#fcfcfc;
 /*END: NOTICES */
 
 
-#groups #new_group a {
+#new_group a {
 background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 }
 

theme/identica/css/display.css

@@ -30,6 +30,9 @@ input, textarea, select,
 .entity_remote_subscribe {
 border-color:#aaa;
 }
+#filter_tags ul li {
+border-color:#ddd;
+}
 
 
 input.submit,
@@ -54,9 +57,9 @@ a,
 div.notice-options input,
 .form_user_block input.submit,
 .form_user_unblock input.submit,
-#entity_send-a-message a,
+.entity_send-a-message a,
 .form_user_nudge input.submit,
-#entity_nudge p {
+.entity_nudge p {
 color:#002E6E;
 }
 
@@ -160,11 +163,11 @@ background-image:url(../../base/images/icons/icon_vcard.gif);
 }
 
 
-#entity_send-a-message a,
+.entity_send-a-message a,
 .form_user_nudge input.submit,
 .form_user_block input.submit,
 .form_user_unblock input.submit,
-#entity_nudge p {
+.entity_nudge p {
 background-position: 0 40%;
 background-repeat: no-repeat;
 background-color:transparent;
@@ -181,10 +184,10 @@ color:#fff;
 background-color:#97BFD1;
 }
 
-#entity_send-a-message a {
+.entity_send-a-message a {
 background-image:url(../images/icons/twotone/green/quote.gif);
 }
-#entity_nudge p,
+.entity_nudge p,
 .form_user_nudge input.submit {
 background-image:url(../images/icons/twotone/green/mail.gif);
 }
@@ -262,7 +265,7 @@ background-color:#fcfcfc;
 /*END: NOTICES */
 
 
-#groups #new_group a {
+#new_group a {
 background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 }