summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/userauthorization.php88
-rw-r--r--config.php.sample2
-rw-r--r--theme/base/css/display.css11
-rw-r--r--theme/default/css/display.css7
-rw-r--r--theme/identica/css/display.css7
5 files changed, 81 insertions, 34 deletions
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 8723848c7..168019149 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -97,47 +97,91 @@ class UserauthorizationAction extends Action
$location = $params['omb_listenee_location'];
$avatar = $params['omb_listenee_avatar'];
- $this->elementStart('div', 'profile');
+ $this->elementStart('div', array('class' => 'profile'));
+ $this->elementStart('div', 'entity_profile vcard');
+ $this->elementStart('a', array('href' => $profile,
+ 'class' => 'url'));
if ($avatar) {
$this->element('img', array('src' => $avatar,
- 'class' => 'avatar',
+ 'class' => 'photo avatar',
'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE,
'alt' => $nickname));
}
- $this->element('a', array('href' => $profile,
- 'class' => 'external profile nickname'),
- $nickname);
+ $hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname';
+ $this->elementStart('span', $hasFN);
+ $this->raw($nickname);
+ $this->elementEnd('span');
+ $this->elementEnd('a');
+
if (!is_null($fullname)) {
- $this->elementStart('div', 'fullname');
- if (!is_null($homepage)) {
- $this->element('a', array('href' => $homepage),
- $fullname);
- } else {
- $this->text($fullname);
- }
- $this->elementEnd('div');
+ $this->elementStart('dl', 'entity_fn');
+ $this->elementStart('dd');
+ $this->elementStart('span', 'fn');
+ $this->raw($fullname);
+ $this->elementEnd('span');
+ $this->elementEnd('dd');
+ $this->elementEnd('dl');
}
if (!is_null($location)) {
- $this->element('div', 'location', $location);
+ $this->elementStart('dl', 'entity_location');
+ $this->element('dt', null, _('Location'));
+ $this->elementStart('dd', 'label');
+ $this->raw($location);
+ $this->elementEnd('dd');
+ $this->elementEnd('dl');
+ }
+
+ if (!is_null($homepage)) {
+ $this->elementStart('dl', 'entity_url');
+ $this->element('dt', null, _('URL'));
+ $this->elementStart('dd');
+ $this->elementStart('a', array('href' => $homepage,
+ 'class' => 'url'));
+ $this->raw($homepage);
+ $this->elementEnd('a');
+ $this->elementEnd('dd');
+ $this->elementEnd('dl');
}
+
if (!is_null($bio)) {
- $this->element('div', 'bio', $bio);
+ $this->elementStart('dl', 'entity_note');
+ $this->element('dt', null, _('Note'));
+ $this->elementStart('dd', 'note');
+ $this->raw($bio);
+ $this->elementEnd('dd');
+ $this->elementEnd('dl');
+ }
+
+ if (!is_null($license)) {
+ $this->elementStart('dl', 'entity_license');
+ $this->element('dt', null, _('License'));
+ $this->elementStart('dd', 'license');
+ $this->element('a', array('href' => $license,
+ 'class' => 'license'),
+ $license);
+ $this->elementEnd('dd');
+ $this->elementEnd('dl');
}
- $this->elementStart('div', 'license');
- $this->element('a', array('href' => $license,
- 'class' => 'license'),
- $license);
- $this->elementEnd('div');
$this->elementEnd('div');
+
+ $this->elementStart('div', 'entity_actions');
+ $this->elementStart('ul');
+ $this->elementStart('li', 'entity_subscribe');
$this->elementStart('form', array('method' => 'post',
'id' => 'userauthorization',
+ 'class' => 'form_user_authorization',
'name' => 'userauthorization',
'action' => common_local_url('userauthorization')));
$this->hidden('token', common_session_token());
- $this->submit('accept', _('Accept'));
- $this->submit('reject', _('Reject'));
+
+ $this->submit('accept', _('Accept'), 'submit accept', null, _('Subscribe to this user'));
+ $this->submit('reject', _('Reject'), 'submit reject', null, _('Reject this subscription'));
$this->elementEnd('form');
+ $this->elementEnd('li');
+ $this->elementEnd('ul');
+ $this->elementEnd('div');
+ $this->elementEnd('div');
}
function sendAuthorization()
diff --git a/config.php.sample b/config.php.sample
index 0a01552fe..e70d9ab46 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -30,6 +30,8 @@ $config['site']['path'] = 'laconica';
#$config['site']['closed'] = true;
#Only allow registration for people invited by another user
#$config['site']['inviteonly'] = true;
+#Make the site invisible to non-logged-in users
+#$config['site']['private'] = true;
# If you want logging sent to a file instead of syslog
#$config['site']['logfile'] = '/tmp/laconica.log';
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3b4a2a4b3..2fb1c007f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -29,6 +29,7 @@ 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; }
@@ -607,7 +608,9 @@ border-radius:4px;
-moz-border-radius:4px;
-webkit-border-radius:4px;
}
-
+.entity_actions .accept {
+margin-bottom:18px;
+}
.entity_tags ul {
list-style-type:none;
@@ -918,6 +921,10 @@ padding:0;
}
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
#new_group, #group_search {
margin-bottom:18px;
}
@@ -1158,4 +1165,4 @@ display:none;
}
.guide {
clear:both;
-} \ No newline at end of file
+}
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 42e29374f..c5d694610 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -164,7 +164,8 @@ background-color:#A9BF4F;
color:#fff;
}
.form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
+.form_group_leave input.submit,
+.form_user_authorization input.reject {
background-color:#97BFD1;
}
@@ -231,10 +232,6 @@ background-color:#fcfcfc;
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
-}
.pagination .nav_prev a,
.pagination .nav_next a {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8edb005a6..c32b6269d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -164,7 +164,8 @@ background-color:#9BB43E;
color:#fff;
}
.form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
+.form_group_leave input.submit,
+.form_user_authorization input.reject {
background-color:#87B4C8;
}
@@ -231,10 +232,6 @@ background-color:#fcfcfc;
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
-}
.pagination .nav_prev a,
.pagination .nav_next a {