summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsarven <csarven@plantard.controlezvous.ca>2009-01-23 05:23:28 +0000
committersarven <csarven@plantard.controlezvous.ca>2009-01-23 05:23:28 +0000
commit500ed2f5eb752a1a1e82d83c8c8b1c58897789b8 (patch)
tree41e5749fb8fc0fa7ad92dddd91716a515c6d56e9
parent7afb2be83f2918747e295fe5d1d90a638beff6a7 (diff)
Cleanup
-rw-r--r--actions/remotesubscribe.php16
-rw-r--r--actions/showstream.php2
-rw-r--r--theme/base/css/display.css16
-rw-r--r--theme/identica/css/display.css13
4 files changed, 36 insertions, 11 deletions
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 3c8346fbe..f727a63b8 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -92,14 +92,26 @@ class RemotesubscribeAction extends Action
{
# id = remotesubscribe conflicts with the
# button on profile page
- $this->elementStart('form', array('id' => 'remsub', 'method' => 'post',
- 'action' => common_local_url('remotesubscribe')));
+ $this->elementStart('form', array('id' => 'form_remote_subscribe',
+ 'method' => 'post',
+ 'class' => 'form_settings',
+ 'action' => common_local_url('remotesubscribe')));
+ $this->elementStart('fieldset');
+ $this->element('legend', 'Subscribe to a remote user');
$this->hidden('token', common_session_token());
+
+ $this->elementStart('ul', 'form_data');
+ $this->elementStart('li');
$this->input('nickname', _('User nickname'), $this->nickname,
_('Nickname of the user you want to follow'));
+ $this->elementEnd('li');
+ $this->elementStart('li');
$this->input('profile_url', _('Profile URL'), $this->profile_url,
_('URL of your profile on another compatible microblogging service'));
+ $this->elementEnd('li');
+ $this->elementEnd('ul');
$this->submit('submit', _('Subscribe'));
+ $this->elementEnd('fieldset');
$this->elementEnd('form');
}
diff --git a/actions/showstream.php b/actions/showstream.php
index 157ccdd0c..2fd56ad2e 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -367,7 +367,7 @@ class ShowstreamAction extends Action
$url = common_local_url('remotesubscribe',
array('nickname' => $this->profile->nickname));
$this->element('a', array('href' => $url,
- 'id' => 'entity_subscribe_remote'),
+ 'class' => 'entity_remote_subscribe'),
_('Subscribe'));
}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d5532a5c9..b4f3ffd54 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -144,7 +144,8 @@ font-weight:bold;
#form_settings_avatar legend,
#newgroup legend,
#editgroup legend,
-#form_tag_user legend {
+#form_tag_user legend,
+#form_remote_subscribe legend {
display:none;
}
@@ -586,7 +587,8 @@ cursor:pointer;
width:100%;
}
.entity_actions a,
-#entity_nudge p {
+#entity_nudge p,
+.entity_remote_subscribe {
text-decoration:none;
font-weight:bold;
display:block;
@@ -606,6 +608,16 @@ padding-left:20px;
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_tags ul {
list-style-type:none;
}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 17e2aee9e..f61d063b6 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -26,7 +26,8 @@ display:none;
input, textarea, select, option {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
-input, textarea, select {
+input, textarea, select,
+.entity_remote_subscribe {
border-color:#aaa;
}
@@ -34,7 +35,8 @@ border-color:#aaa;
input.submit,
#form_notice.warning #notice_text-count,
#nav_register a,
-.form_settings .form_note {
+.form_settings .form_note,
+.entity_remote_subscribe {
background-color:#A9BF4F;
}
@@ -43,7 +45,8 @@ input:focus, textarea:focus, select:focus,
border-color:#A9BF4F;
}
input.submit,
-#nav_register a {
+#nav_register a,
+.entity_remote_subscribe {
color:#fff;
}
@@ -74,9 +77,7 @@ background-color:#fcfcfc;
background-color:#fcfffc;
}
-#aside_primary,
-#entity_subscribe a,
-#TB_window input.submit {
+#aside_primary {
background-color:#CEE1E9;
}