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

diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1a85330e25a8238d473212fe9b76c441846444f3 100644 (file)
--- 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 3c9912daaf51dfb43b68fbd60a27643e7cc0add5..b1989857303c1c627a8890e0b50571758eb44818 100644 (file)
--- 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 7a40de67da8785ffcdfa25c68fbce7cb669a0a24..4a56ec0e16fd92718407d96c5e218c5578904ca8 100644 (file)
--- 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>

diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 7395d781af5f7bc37230cbfce118f0ecc93df0c0..c747120be8fd3525c6e64971265be38e48c460a4 100644 (file)
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -6,7 +6,7 @@
 $owner = get_user($vars['annotation']->owner_guid);
 
 ?>
-<div class="generic_comment"><!-- start of generic_comment div -->
+<div class="generic_comment clearfloat"><!-- start of generic_comment div -->
 
        <div class="generic_comment_icon">
                <?php
@@ -25,7 +25,7 @@ $owner = get_user($vars['annotation']->owner_guid);
                        if ($vars['annotation']->canEdit()) {
 
                        ?>
-               <div class="delete_button">
+               <span class="delete_button">
                        <?php
 
                                echo elgg_view("output/confirmlink",array(
@@ -35,7 +35,7 @@ $owner = get_user($vars['annotation']->owner_guid);
                                ));
 
                        ?>
-               </div>
+               </span>
 
                        <?php
                        } //end of can edit if statement

diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php
index a52d8659c35050305f8189c413d1b6f257d25c58..0bb4012a6bbe07260539b5043576f780d9715a41 100644 (file)
--- a/views/default/comments/forms/edit.php
+++ b/views/default/comments/forms/edit.php
@@ -11,7 +11,7 @@
         
         if (isset($vars['entity']) && isloggedin()) {
         
-                $form_body = "<div class='contentWrapper comment'><p class='longtext_editarea'><label>".elgg_echo("generic_comments:text")."<br />" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</label></p>";
+                $form_body = "<div class='comment margin_top'><p class='longtext_editarea'><label>".elgg_echo("generic_comments:text")."<br />" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</label></p>";
                 $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));
                 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))) . "</div>";