summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/showstream.php1
-rw-r--r--lib/blockform.php15
-rw-r--r--lib/subscribeform.php2
-rw-r--r--lib/unblockform.php13
-rw-r--r--lib/unsubscribeform.php2
-rw-r--r--theme/base/css/display.css30
-rw-r--r--theme/identica/css/display.css35
7 files changed, 64 insertions, 34 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index 1d79ea30d..d550ec295 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -22,6 +22,7 @@
* @category Personal
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
* @copyright 2008-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/
diff --git a/lib/blockform.php b/lib/blockform.php
index 51e43f8b5..b7790681d 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -88,6 +88,19 @@ class BlockForm extends Form
return 'block-' . $this->profile->id;
}
+
+ /**
+ * class of the form
+ *
+ * @return string class of the form
+ */
+
+ function formClass()
+ {
+ return 'form_user_block';
+ }
+
+
/**
* Action of the form
*
@@ -127,4 +140,4 @@ class BlockForm extends Form
{
$this->out->submit('submit', _('Block'));
}
-} \ No newline at end of file
+}
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index 8b69efd1a..231e740a7 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -89,7 +89,7 @@ class SubscribeForm extends Form
function formClass()
{
- return 'form_subscribe';
+ return 'form_user_subscribe';
}
diff --git a/lib/unblockform.php b/lib/unblockform.php
index 4cb9ae4f5..025011a82 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -89,6 +89,17 @@ class UnblockForm extends Form
}
/**
+ * class of the form
+ *
+ * @return string class of the form
+ */
+
+ function formClass()
+ {
+ return 'form_user_unblock';
+ }
+
+ /**
* Action of the form
*
* @return string URL of the action
@@ -127,4 +138,4 @@ class UnblockForm extends Form
{
$this->out->submit('submit', _('Unblock'));
}
-} \ No newline at end of file
+}
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index b222f0e54..092369db7 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -89,7 +89,7 @@ class UnsubscribeForm extends Form
function formClass()
{
- return 'form_unsubscribe';
+ return 'form_user_unsubscribe';
}
/**
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3c776aea0..fc1f35e35 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -570,8 +570,7 @@ display:none;
list-style-type:none;
}
#user_actions li {
-border-top-width:1px;
-border-top-style:dotted;
+margin-bottom:4px;
}
#user_actions li:first-child {
border-top:0;
@@ -584,34 +583,29 @@ padding:0;
display:none;
}
-#user_actions a,
#user_actions input.submit {
display:block;
text-align:left;
-padding:4px 0 4px 19px;
+cursor:pointer;
+width:100%;
}
#user_actions a {
text-decoration:none;
}
-#user_subscribe a,
-#TB_window input.submit,
-#user_actions input.submit {
-border:0;
-cursor:pointer;
-padding-left:16px;
-width:100%;
-font-size:0.9em;
-}
-#user_subscribe a {
-width:auto;
+
+
+.form_user_block input.submit,
+.form_user_unblock input.submit {
+border:0;
padding-left:20px;
}
-#user_subscribe a,
-#TB_window input.submit,
+
+
+#user_subscribe input.submit,
.form_user_subscribe input.submit {
-font-weight:bold;
+
}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d5a5ce956..eb5f78b9e 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -125,30 +125,41 @@ background-image:url(../../base/images/icons/icon_vcard.gif);
/*user_actions*/
#user_actions li {
-border-top-color:#eee;
+/*border-top-color:#eee;*/
}
-#user_subscribe a,
-#TB_window input.submit,
-.form_user_subscribe input.submit {
-background-image: url(../images/icons/twotone/green/shield.gif);
-background-position: 0 45%;
+
+
+.form_user_send-a-message input.submit,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit {
+background-position: 0 40%;
background-repeat: no-repeat;
+background-color:transparent;
}
+.form_user_subscribe input.submit,
.form_user_unsubscribe input.submit {
-background-color:#647819;
+background-color:#A9BF4F;
color:#fff;
}
+.form_user_unsubscribe input.submit {
+background-color:#97BFD1;
+}
+
#user_send-a-message a {
-background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
+background-image:url(../images/icons/twotone/green/quote.gif);
}
.form_user_nudge input.submit {
-background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat;
+background-image:url(../images/icons/twotone/green/mail.gif);
}
-.form_user_block input.submit {
-background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
+.form_user_block input.submit,
+.form_user_unblock input.submit {
+background-image:url(../images/icons/twotone/green/shield.gif);
+color:#000;
}
+
/* NOTICES */
.notices li.over {
background-color:#fcfcfc;
@@ -242,4 +253,4 @@ background-color:#0f0;
}
#home #intro #step_create-a-community a {
background-color:#00f;
-} \ No newline at end of file
+}