summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--js/util.js9
-rw-r--r--lib/action.php4
-rw-r--r--lib/grouplist.php6
-rw-r--r--lib/profilelist.php8
-rw-r--r--plugins/Facebook/facebookaction.php4
-rw-r--r--plugins/Facebook/facebookhome.php4
-rw-r--r--plugins/InfiniteScroll/infinitescroll.js2
-rw-r--r--theme/identica/css/display.css19
8 files changed, 37 insertions, 19 deletions
diff --git a/js/util.js b/js/util.js
index 9bdc48507..c59c63910 100644
--- a/js/util.js
+++ b/js/util.js
@@ -228,6 +228,7 @@ var SN = { // StatusNet
$('#'+notice.id).fadeIn(2500);
SN.U.NoticeAttachments();
SN.U.NoticeReply();
+ SN.U.NoticeFavor();
}
}
$('#'+form_id+' #'+SN.C.S.NoticeDataText).val('');
@@ -276,6 +277,11 @@ var SN = { // StatusNet
return true;
},
+ NoticeFavor: function() {
+ $('.form_favor').each(function() { SN.U.FormXHR($(this)); });
+ $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
+ },
+
NoticeAttachments: function() {
$.fn.jOverlay.options = {
method : 'GET',
@@ -386,8 +392,7 @@ var SN = { // StatusNet
Notices: function() {
if ($('body.user_in').length > 0) {
- $('.form_favor').each(function() { SN.U.FormXHR($(this)); });
- $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
+ SN.U.NoticeFavor();
SN.U.NoticeReply();
}
diff --git a/lib/action.php b/lib/action.php
index 80f398fbd..b5cf3240c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -1048,8 +1048,7 @@ class Action extends HTMLOutputter // lawsuit
{
// Does a little before-after block for next/prev page
if ($have_before || $have_after) {
- $this->elementStart('div', array('class' => 'pagination'));
- $this->elementStart('dl', null);
+ $this->elementStart('dl', 'pagination');
$this->element('dt', null, _('Pagination'));
$this->elementStart('dd', null);
$this->elementStart('ul', array('class' => 'nav'));
@@ -1074,7 +1073,6 @@ class Action extends HTMLOutputter // lawsuit
$this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
- $this->elementEnd('div');
}
}
diff --git a/lib/grouplist.php b/lib/grouplist.php
index cc734bdd0..99bff9cdc 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -85,18 +85,18 @@ class GroupList extends Widget
function showGroup()
{
- $this->out->elementStart('li', array('class' => 'profile',
+ $this->out->elementStart('li', array('class' => 'profile hentry',
'id' => 'group-' . $this->group->id));
$user = common_current_user();
- $this->out->elementStart('div', 'entity_profile vcard');
+ $this->out->elementStart('div', 'entity_profile vcard entry-content');
$logo = ($this->group->stream_logo) ?
$this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
$this->out->elementStart('a', array('href' => $this->group->homeUrl(),
- 'class' => 'url',
+ 'class' => 'url entry-title',
'rel' => 'contact group'));
$this->out->element('img', array('src' => $logo,
'class' => 'photo avatar',
diff --git a/lib/profilelist.php b/lib/profilelist.php
index bbb722701..3412d41d1 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -76,7 +76,7 @@ class ProfileList extends Widget
function startList()
{
- $this->out->elementStart('ul', 'profiles');
+ $this->out->elementStart('ul', 'profiles xoxo');
}
function endList()
@@ -140,7 +140,7 @@ class ProfileListItem extends Widget
function startItem()
{
- $this->out->elementStart('li', array('class' => 'profile',
+ $this->out->elementStart('li', array('class' => 'profile hentry',
'id' => 'profile-' . $this->profile->id));
}
@@ -175,14 +175,14 @@ class ProfileListItem extends Widget
function startProfile()
{
- $this->out->elementStart('div', 'entity_profile vcard');
+ $this->out->elementStart('div', 'entity_profile vcard entry-content');
}
function showAvatar()
{
$avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
$this->out->elementStart('a', array('href' => $this->profile->profileurl,
- 'class' => 'url',
+ 'class' => 'url entry-title',
'rel' => 'contact'));
$this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
'class' => 'photo avatar',
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index a10fdf90d..c852bbf5e 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -382,8 +382,7 @@ class FacebookAction extends Action
{
// Does a little before-after block for next/prev page
if ($have_before || $have_after) {
- $this->elementStart('div', array('class' => 'pagination'));
- $this->elementStart('dl', null);
+ $this->elementStart('dl', 'pagination');
$this->element('dt', null, _('Pagination'));
$this->elementStart('dd', null);
$this->elementStart('ul', array('class' => 'nav'));
@@ -408,7 +407,6 @@ class FacebookAction extends Action
$this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
- $this->elementEnd('div');
}
}
diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
index 91c0cc6b8..ea141c2c2 100644
--- a/plugins/Facebook/facebookhome.php
+++ b/plugins/Facebook/facebookhome.php
@@ -244,8 +244,7 @@ class FacebookhomeAction extends FacebookAction
// XXX: Fix so this uses common_local_url() if possible.
if ($have_before || $have_after) {
- $this->elementStart('div', array('class' => 'pagination'));
- $this->elementStart('dl', null);
+ $this->elementStart('dl', 'pagination');
$this->element('dt', null, _('Pagination'));
$this->elementStart('dd', null);
$this->elementStart('ul', array('class' => 'nav'));
@@ -270,7 +269,6 @@ class FacebookhomeAction extends FacebookAction
$this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
- $this->elementEnd('div');
}
}
diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index ae4d53d09..09b2d4f72 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -6,7 +6,7 @@ jQuery(document).ready(function($){
loadingImg : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
text : "<em>Loading the next set of posts...</em>",
donetext : "<em>Congratulations, you\'ve reached the end of the Internet.</em>",
- navSelector : "div.pagination",
+ navSelector : ".pagination",
contentSelector : "#notices_primary ol.notices",
itemSelector : "#notices_primary ol.notices li"
},function(){
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 4e3bc5980..94bef339f 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -178,6 +178,11 @@ background-color:rgba(255, 255, 255, 0.7);
#site_nav_local_views .current a {
text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
}
+.processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+background-repeat:no-repeat;
+background-position:47% 47%;
+}
.error {
background-color:#F7E8E8;
@@ -330,3 +335,17 @@ background-position:10% -187px;
.pagination .nav_next a {
background-position:105% -252px;
}
+.pagination .nav .processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
+.pagination .nav_next a.processing {
+background-position:90% 47%;
+}
+.pagination .nav_prev a.processing {
+background-position:10% 47%;
+}
+
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-06 06:34:41 +0000