aboutsummaryrefslogtreecommitdiff
path: root/mod/blog
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-12 12:30:04 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-12 12:30:04 +0000
commitb7411d4efa0c2f116c2d5da814b7d817a1e14660 (patch)
treeaf60f8f45876c39d8d2025f1b6742f8e6bd8027a /mod/blog
parent13796cc18921229f16f9b387e360f1c908336671 (diff)
downloadelgg-b7411d4efa0c2f116c2d5da814b7d817a1e14660.tar.gz
elgg-b7411d4efa0c2f116c2d5da814b7d817a1e14660.tar.bz2
Updated interface on new blog (listings and edit/new blog pages).
git-svn-id: http://code.elgg.org/elgg/trunk@5376 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/blog')
-rw-r--r--mod/blog/views/default/blog/css.php11
-rw-r--r--mod/blog/views/default/blog/forms/edit.php14
-rw-r--r--mod/blog/views/default/object/blog.php24
3 files changed, 32 insertions, 17 deletions
diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
index e69de29bb..1a85330e2 100644
--- a/mod/blog/views/default/blog/css.php
+++ b/mod/blog/views/default/blog/css.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Blog CSS
+ *
+ * @package Blog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+*/
+?>
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
index 3c9912daa..b19898573 100644
--- a/mod/blog/views/default/blog/forms/edit.php
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -26,6 +26,7 @@ $forward = $_SERVER['HTTP_REFERER'];
$action_buttons = '';
$guid_input = '';
+$delete_link = '';
// if entity is set, we're editing.
if (isset ($vars['entity'])) {
@@ -45,16 +46,14 @@ if (isset ($vars['entity'])) {
$delete_link = elgg_view('output/confirmlink', array(
'href' => $delete_url,
'text' => elgg_echo('delete'),
- 'class' => 'action_button'
+ 'class' => 'action_button disabled'
));
- $action_buttons = $delete_link;
-
$guid_input = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $values['guid']));
}
-$save_button = elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'action_button'));
-$action_buttons .= $save_button;
+$save_button = elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'submit_button'));
+$action_buttons = $save_button . $delete_link;
$title_label = elgg_echo('title');
$title_input = elgg_view('input/text', array(
@@ -123,9 +122,12 @@ $publish_date_input = elgg_view('input/datepicker', array(
// hidden inputs
//$container_guid_input = elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $values['container_guid']));
$forward_input = elgg_view('input/hidden', array('internalname' => 'forward', 'value' => $forward));
+$page_title = elgg_echo('blog:edit')." ".$values['title'];
$form_body = <<<___END
-<p>
+<h2>$page_title</h2>
+
+<p class="margin_top">
<label for="blog_title">$title_label</label>
$title_input
</p>
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 7a40de67d..4a56ec0e1 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -36,14 +36,14 @@ if ($blog->comments_on == 'Yes') {
// links to delete or edit.
if ($blog->canEdit()) {
$edit_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
- $edit_link = "<a class=\"action_button\" href=\"$edit_url\">" . elgg_echo('edit') . '</a>';
+ $edit_link = "<a href=\"$edit_url\">" . elgg_echo('edit') . '</a>';
$delete_url = "{$vars['url']}action/blog/delete?guid={$blog->getGUID()}";
- $delete_link = elgg_view('output/confirmlink', array(
+ $delete_link = "<span class='delete_button'>".elgg_view('output/confirmlink', array(
'href' => $delete_url,
'text' => elgg_echo('delete'),
- 'class' => 'action_button'
- ));
+ 'confirm' => elgg_echo('deleteconfirm')
+ ))."</span>";
$edit = "$edit_link $delete_link";
} else {
@@ -62,19 +62,21 @@ if ($full) {
echo <<<___END
<div class="blog clearfloat">
- <h1>$owner_title</h2>
- $edit
- <h2 class="entity_title">{$blog->title}</h2>
- <div class="blog entity_listing_icon">
+ <div id="content_header" class="clearfloat">
+ <div class="content_header_title"><h2>$owner_title</h2></div>
+ </div>
+ <div class="entity_listing_icon">
$owner_icon
</div>
<div class="entity_listing_info">
+ <div class="entity_metadata">$edit</div>
+ <p class="entity_title">{$blog->title}</p>
<p class="entity_subtext">
$date
- $tags
$categories
$comments_link
</p>
+ <p class="tags">$tags</p>
<p class="blog body">$body</p>
</div>
</div>
@@ -90,14 +92,14 @@ ___END;
$owner_icon
</div>
<div class="entity_listing_info">
- $edit
+ <div class="entity_metadata">$edit</div>
<p class="entity_title">$linked_title</p>
<p class="entity_subtext">
$date
- $tags
$categories
$comments_link
</p>
+ <p class="tags">$tags</p>
<p>$excerpt</p>
</div>
</div>