summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/doc.php20
-rw-r--r--actions/register.php19
-rw-r--r--lib/groupeditform.php2
-rw-r--r--theme/base/css/display.css22
-rw-r--r--theme/base/css/ie.css8
-rw-r--r--theme/base/css/ie6.css8
-rw-r--r--theme/base/css/ie7.css2
7 files changed, 64 insertions, 17 deletions
diff --git a/actions/doc.php b/actions/doc.php
index aaf006f07..3755bb051 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -67,6 +67,25 @@ class DocAction extends Action
$this->showPage();
}
+ // overrrided to add entry-title class
+ function showPageTitle() {
+ $this->element('h1', array('class' => 'entry-title'), $this->title());
+ }
+
+ // overrided to add hentry, and content-inner classes
+ function showContentBlock()
+ {
+ $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
+ $this->showPageTitle();
+ $this->showPageNoticeBlock();
+ $this->elementStart('div', array('id' => 'content_inner',
+ 'class' => 'entry-content'));
+ // show the actual content (forms, lists, whatever)
+ $this->showContent();
+ $this->elementEnd('div');
+ $this->elementEnd('div');
+ }
+
/**
* Display content.
*
@@ -89,4 +108,3 @@ class DocAction extends Action
return ucfirst($this->title);
}
}
-
diff --git a/actions/register.php b/actions/register.php
index 159daaa73..a63da2e0f 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -248,6 +248,25 @@ class RegisterAction extends Action
return ($user !== false);
}
+ // overrrided to add entry-title class
+ function showPageTitle() {
+ $this->element('h1', array('class' => 'entry-title'), $this->title());
+ }
+
+ // overrided to add hentry, and content-inner class
+ function showContentBlock()
+ {
+ $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
+ $this->showPageTitle();
+ $this->showPageNoticeBlock();
+ $this->elementStart('div', array('id' => 'content_inner',
+ 'class' => 'entry-content'));
+ // show the actual content (forms, lists, whatever)
+ $this->showContent();
+ $this->elementEnd('div');
+ $this->elementEnd('div');
+ }
+
/**
* Instructions or a notice for the page
*
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index 14205d250..fe53918d1 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -147,7 +147,7 @@ class GroupEditForm extends Form
_('URL of the homepage or blog of the group or topic'));
$this->out->elementEnd('li');
$this->out->elementStart('li');
- $this->out->textarea('description', _('description'),
+ $this->out->textarea('description', _('Description'),
($this->out->arg('description')) ? $this->out->arg('description') : $this->group->description,
_('Describe the group or topic in 140 chars'));
$this->out->elementEnd('li');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 253cbfa38..073d2d40a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -547,6 +547,7 @@ margin-bottom:4px;
width:auto;
clear:none;
}
+
.entity_profile .entity_fn {
margin-left:11px;
margin-right:4px;
@@ -584,11 +585,8 @@ display:none;
/*entity_actions*/
.entity_actions {
-clear:left;
-float:left;
-position:absolute;
-top:0;
-right:0;
+float:right;
+
}
.entity_actions h2 {
display:none;
@@ -936,7 +934,7 @@ outline:none;
}
.notice-options .notice_reply a,
-.notice-options form input.submit {
+.notice-options input.submit {
display:block;
border:0;
}
@@ -1019,18 +1017,18 @@ border-right:0;
-/*If there is hentry on #content_inner, this doesn't need to be specific to #doc */
-#doc #content_inner p {
+/*If there is hentry on #content_inner, then this doesn't need to be specific to #doc or any other section */
+.hentry .entry-content p {
margin-bottom:18px;
}
-#doc #content_inner ol,
-#doc #content_inner ul {
+.hentry entry-content ol,
+.hentry .entry-content ul {
list-style-position:inside;
}
-#doc #content_inner li {
+.hentry .entry-content li {
margin-bottom:18px;
}
-#doc #content_inner li li {
+.hentry .entry-content li li {
margin-left:18px;
}
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 9baa953b3..08b027b59 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -3,7 +3,7 @@
#aside_primary {
padding-left:11px;
}
-.notice-options form input.submit {
+.notice-options input.submit {
font-size:0;
margin-top:3px;
height:16px;
@@ -23,4 +23,8 @@ margin-left:-7px;
.notice div.entry-content .timestamp a {
margin-right:4px;
-} \ No newline at end of file
+}
+
+.entity_profile .entity_nickname {
+padding-right:3px;
+}
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
new file mode 100644
index 000000000..4a2316903
--- /dev/null
+++ b/theme/base/css/ie6.css
@@ -0,0 +1,8 @@
+/* IE6 specific styles */
+.entity_profile .entity_nickname,
+.entity_profile .entity_location,
+.entity_profile .entity_url,
+.entity_profile .entity_note,
+.entity_profile .entity_tags {
+margin-left:55px;
+}
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
index a6e2548ab..a6ee001e2 100644
--- a/theme/base/css/ie7.css
+++ b/theme/base/css/ie7.css
@@ -2,4 +2,4 @@
#form_notice textarea {
width:370px;
-} \ No newline at end of file
+}