From 4766f36a4d74924f21ff329c4318ce4e069ffa04 Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 3 Mar 2010 17:53:05 +0000 Subject: Pulled in the interface changes. git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/blog/categorylist.php | 14 ++ mod/blog/views/default/blog/css.php | 210 +++++++++++++++++++++ mod/blog/views/default/blog/forms/edit.php | 200 ++++++++++++++++++++ mod/blog/views/default/blog/gallery.php | 31 +++ mod/blog/views/default/blog/listing.php | 25 +++ mod/blog/views/default/blog/menu.php | 17 ++ mod/blog/views/default/blog/notfound.php | 21 +++ mod/blog/views/default/blog/previewpane.php | 6 + mod/blog/views/default/blog/view.php | 26 +++ mod/blog/views/default/object/blog.php | 150 +++++++++++++++ .../views/default/river/object/blog/annotate.php | 13 ++ .../views/default/river/object/blog/create.php | 20 ++ .../views/default/river/object/blog/update.php | 13 ++ 13 files changed, 746 insertions(+) create mode 100644 mod/blog/views/default/blog/categorylist.php create mode 100644 mod/blog/views/default/blog/css.php create mode 100644 mod/blog/views/default/blog/forms/edit.php create mode 100644 mod/blog/views/default/blog/gallery.php create mode 100644 mod/blog/views/default/blog/listing.php create mode 100644 mod/blog/views/default/blog/menu.php create mode 100644 mod/blog/views/default/blog/notfound.php create mode 100644 mod/blog/views/default/blog/previewpane.php create mode 100644 mod/blog/views/default/blog/view.php create mode 100644 mod/blog/views/default/object/blog.php create mode 100644 mod/blog/views/default/river/object/blog/annotate.php create mode 100644 mod/blog/views/default/river/object/blog/create.php create mode 100644 mod/blog/views/default/river/object/blog/update.php (limited to 'mod/blog/views') diff --git a/mod/blog/views/default/blog/categorylist.php b/mod/blog/views/default/blog/categorylist.php new file mode 100644 index 000000000..90403c550 --- /dev/null +++ b/mod/blog/views/default/blog/categorylist.php @@ -0,0 +1,14 @@ + + +
+ +
+ + \ No newline at end of file diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php new file mode 100644 index 000000000..c9522c901 --- /dev/null +++ b/mod/blog/views/default/blog/css.php @@ -0,0 +1,210 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + +?> +#blogs .pagination { + margin:5px 10px 0 10px; + padding:5px; + display:block; +} +#blogs #two_column_left_sidebar_maincontent { + padding-bottom:10px; +} + +.singleview { + margin-top:10px; +} + +.blog_post_icon { + float:left; + margin:3px 0 0 0; + padding:0; +} + +.blog_post h3 { + font-size: 150%; + margin:0 0 10px 0; + padding:0; +} + +.blog_post h3 a { + text-decoration: none; +} + +.blog_post p { + margin: 0 0 5px 0; +} + +.blog_post .strapline { + margin: 0 0 0 35px; + padding:0; + color: #aaa; + line-height:1em; +} +.blog_post p.tags { + background:transparent url(_graphics/icon_tag.gif) no-repeat scroll left 2px; + margin:0 0 7px 35px; + padding:0pt 0pt 0pt 16px; + min-height:22px; +} +.blog_post .options { + margin:0; + padding:0; +} + +.blog_post_body img[align="left"] { + margin: 10px 10px 10px 0; + float:left; +} +.blog_post_body img[align="right"] { + margin: 10px 0 10px 10px; + float:right; +} +.blog_post_body img { + margin: 10px !important; +} + +.blog-comments h3 { + font-size: 150%; + margin-bottom: 10px; +} +.blog-comment { + margin-top: 10px; + margin-bottom:20px; + border-bottom: 1px solid #aaaaaa; +} +.blog-comment img { + float:left; + margin: 0 10px 0 0; +} +.blog-comment-menu { + margin:0; +} +.blog-comment-byline { + background: #dddddd; + height:22px; + padding-top:3px; + margin:0; +} +.blog-comment-text { + margin:5px 0 5px 0; +} + +/* New blog edit column */ +#blog_edit_page { + /* background: #bbdaf7; */ + margin-top:-10px; +} +#blog_edit_page #content_area_user_title h2 { + background: none; + border-top: none; + margin:0 0 10px 0px; + padding:0px 0 0 0; +} +#blog_edit_page #blog_edit_sidebar #content_area_user_title h2 { + background:none; + border-top:none; + margin:inherit; + padding:0 0 5px 5px; + font-size:1.25em; + line-height:1.2em; +} +#blog_edit_page #blog_edit_sidebar { + margin:0px 0 22px 0; + background: #dedede; + padding:5px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-bottom:1px solid #cccccc; + border-right:1px solid #cccccc; +} +#blog_edit_page #two_column_left_sidebar_210 { + width:210px; + margin:0px 0 20px 0px; + min-height:360px; + float:left; + padding:0; +} +#blog_edit_page #two_column_left_sidebar_maincontent { + margin:0 0px 20px 20px; + padding:10px 20px 20px 20px; + width:670px; + background: #bbdaf7; +} +/* unsaved blog post preview */ +.blog_previewpane { + border:1px solid #D3322A; + background:#F7DAD8; + padding:10px; + margin:10px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; +} +.blog_previewpane p { + margin:0; +} + +#blog_edit_sidebar .publish_controls, +#blog_edit_sidebar .blog_access, +#blog_edit_sidebar .publish_options, +#blog_edit_sidebar .publish_blog, +#blog_edit_sidebar .allow_comments, +#blog_edit_sidebar .categories { + margin:0 5px 5px 5px; + border-top:1px solid #cccccc; +} +#blog_edit_page ul { + padding-left:0px; + margin:5px 0 5px 0; + list-style: none; +} +#blog_edit_page p { + margin:5px 0 5px 0; +} +#blog_edit_page #two_column_left_sidebar_maincontent p { + margin:0 0 15px 0; +} +#blog_edit_page .publish_blog input[type="submit"] { + font-weight: bold; + padding:2px; + height:auto; +} +#blog_edit_page .preview_button a { + font: 12px/100% Arial, Helvetica, sans-serif; + font-weight: bold; + background:white; + border: 1px solid #cccccc; + color:#999999; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + width: auto; + height: auto; + padding: 3px; + margin:1px 1px 5px 10px; + cursor: pointer; + float:right; +} +#blog_edit_page .preview_button a:hover { + background:#4690D6; + color:white; + text-decoration: none; + border: 1px solid #4690D6; +} +#blog_edit_page .allow_comments label { + font-size: 100%; +} + + + + + + diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php new file mode 100644 index 000000000..d3f4d7e52 --- /dev/null +++ b/mod/blog/views/default/blog/forms/edit.php @@ -0,0 +1,200 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['object'] Optionally, the blog post to edit + */ + + // Set title, form destination + if (isset($vars['entity'])) { + $title = sprintf(elgg_echo("blog:editpost"),$object->title); + $action = "blog/edit"; + $title = $vars['entity']->title; + $body = $vars['entity']->description; + $tags = $vars['entity']->tags; + if ($vars['entity']->comments_on == 'Off') { + $comments_on = false; + } else { + $comments_on = true; + } + $access_id = $vars['entity']->access_id; + } else { + $title = elgg_echo("blog:addpost"); + $action = "blog/add"; + $tags = ""; + $title = ""; + $comments_on = true; + $description = ""; + if (defined('ACCESS_DEFAULT')) + $access_id = ACCESS_DEFAULT; + else + $access_id = 0; + + $container = $vars['container_guid'] ? elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $vars['container_guid'])) : ""; + } + + // Just in case we have some cached details + if (empty($body)) { + $body = $vars['user']->blogbody; + if (!empty($body)) { + $title = $vars['user']->blogtitle; + $tags = $vars['user']->blogtags; + } + } + + // set the required variables + + $title_label = elgg_echo('title'); + $title_textbox = elgg_view('input/text', array('internalname' => 'blogtitle', 'value' => $title)); + $text_label = elgg_echo('blog:text'); + $text_textarea = elgg_view('input/longtext', array('internalname' => 'blogbody', 'value' => $body)); + $tag_label = elgg_echo('tags'); + $tag_input = elgg_view('input/tags', array('internalname' => 'blogtags', 'value' => $tags)); + $access_label = elgg_echo('access'); + + //$comments_select = elgg_view('input/checkboxes', array('internalname' => 'comments_on', 'value' => '')); + if($comments_on) + $comments_on_switch = "checked=\"checked\""; + else + $comment_on_switch = ""; + + $access_input = elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id)); + $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('publish'))); + $conversation = elgg_echo('Conversation'); + $publish = elgg_echo('publish'); + $cat = elgg_echo('categories'); + $preview = elgg_echo('blog:preview'); + $privacy = elgg_echo('access'); + $savedraft = elgg_echo('blog:draft:save'); + $draftsaved = elgg_echo('blog:draft:saved'); + $never = elgg_echo('blog:never'); + $allowcomments = elgg_echo('blog:comments:allow'); + + // INSERT EXTRAS HERE + $extras = elgg_view('categories',$vars); + if (!empty($extras)) $extras = '
' . $extras . '
'; + +?> + + + +
+
+
{$preview}
+

{$publish}

+
+

+ {$savedraft} +

+
+
+ +

{$draftsaved}: {$never}

+
+
+

{$privacy}: {$access_input} +

+
+ {$submit_input} +
+
+ +
+

{$conversation}

+
+

+
+
+ + {$extras} + + $container + + + + +
+EOT; + +?> + + 'blogpost', 'value' => $vars['entity']->getGUID())); + } else { + $entity_hidden = ''; + } + + $form_body .= << +
+ $title_textbox +

+

+
+ $text_textarea +

+

+
+ $tag_input +

+ +

+ $entity_hidden + +

+
+EOT; + + echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body, 'internalid' => 'blogPostForm')); +?> + + diff --git a/mod/blog/views/default/blog/gallery.php b/mod/blog/views/default/blog/gallery.php new file mode 100644 index 000000000..23f0418bc --- /dev/null +++ b/mod/blog/views/default/blog/gallery.php @@ -0,0 +1,31 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + + $owner = $vars['entity']->getOwnerEntity(); + $friendlytime = friendly_time($vars['entity']->time_created); + $icon = elgg_view( + "profile/icon", array( + 'entity' => $owner, + 'size' => 'small', + ) + ); + $info = "

" . elgg_echo('blog') . ": getURL()}\">{$vars['entity']->title}

"; + $info .= "

getURL()}\">{$owner->name} {$friendlytime}

"; + + //display + echo "
"; + echo "
" . $icon . "
"; + echo "
" . $info . "
"; + echo "
"; + + +?> \ No newline at end of file diff --git a/mod/blog/views/default/blog/listing.php b/mod/blog/views/default/blog/listing.php new file mode 100644 index 000000000..b2dad2570 --- /dev/null +++ b/mod/blog/views/default/blog/listing.php @@ -0,0 +1,25 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + + $owner = $vars['entity']->getOwnerEntity(); + $friendlytime = friendly_time($vars['entity']->time_created); + $icon = elgg_view( + "profile/icon", array( + 'entity' => $owner, + 'size' => 'small', + ) + ); + $info = "

" . elgg_echo('blog') . ": getURL()}\">{$vars['entity']->title}

"; + $info .= "

getURL()}\">{$owner->name} {$friendlytime}

"; + echo elgg_view_listing($icon,$info); + +?> \ No newline at end of file diff --git a/mod/blog/views/default/blog/menu.php b/mod/blog/views/default/blog/menu.php new file mode 100644 index 000000000..45384ae72 --- /dev/null +++ b/mod/blog/views/default/blog/menu.php @@ -0,0 +1,17 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + +?> + +

+ +

\ No newline at end of file diff --git a/mod/blog/views/default/blog/notfound.php b/mod/blog/views/default/blog/notfound.php new file mode 100644 index 000000000..543b98374 --- /dev/null +++ b/mod/blog/views/default/blog/notfound.php @@ -0,0 +1,21 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + */ + +?> + +

+ +

\ No newline at end of file diff --git a/mod/blog/views/default/blog/previewpane.php b/mod/blog/views/default/blog/previewpane.php new file mode 100644 index 000000000..0828c06a9 --- /dev/null +++ b/mod/blog/views/default/blog/previewpane.php @@ -0,0 +1,6 @@ +
+

+ + +

+
\ No newline at end of file diff --git a/mod/blog/views/default/blog/view.php b/mod/blog/views/default/blog/view.php new file mode 100644 index 000000000..18841d224 --- /dev/null +++ b/mod/blog/views/default/blog/view.php @@ -0,0 +1,26 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['posts'] An array of posts to view + */ + + // If there are any posts to view, view them + if (is_array($vars['posts']) && sizeof($vars['posts']) > 0) { + + foreach($vars['posts'] as $post) { + + echo elgg_view_entity($post); + + } + + } + +?> \ No newline at end of file diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php new file mode 100644 index 000000000..898705911 --- /dev/null +++ b/mod/blog/views/default/object/blog.php @@ -0,0 +1,150 @@ + + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + * @uses $vars['entity'] Optionally, the blog post to view + */ + + if (isset($vars['entity'])) { + + //display comments link? + if ($vars['entity']->comments_on == 'Off') { + $comments_on = false; + } else { + $comments_on = true; + } + + if (get_context() == "search" && $vars['entity'] instanceof ElggObject) { + + //display the correct layout depending on gallery or list view + if (get_input('search_viewtype') == "gallery") { + + //display the gallery view + echo elgg_view("blog/gallery",$vars); + + } else { + + echo elgg_view("blog/listing",$vars); + + } + + + } else { + + if ($vars['entity'] instanceof ElggObject) { + + $url = $vars['entity']->getURL(); + $owner = $vars['entity']->getOwnerEntity(); + $canedit = $vars['entity']->canEdit(); + + } else { + + $url = 'javascript:history.go(-1);'; + $owner = $vars['user']; + $canedit = false; + + } +?> + +
+ +
+

title; ?>

+ +
+ $owner, 'size' => 'tiny')); + ?> +
+

+ time_created) + ); + + ?> + name; ?>   + + +
+ +

+ + $vars['entity']->tags)); + if (!empty($tags)) { + echo '

' . $tags . '

'; + } + + $categories = elgg_view('categories/view', $vars); + if (!empty($categories)) { + echo '

' . $categories . '

'; + } + + ?> +
+
+ + + $vars['entity']->description)); + + ?> +
+ +

+ +   + $vars['url'] . "action/blog/delete?blogpost=" . $vars['entity']->getGUID(), + 'text' => elgg_echo('delete'), + 'confirm' => elgg_echo('deleteconfirm'), + )); + + // Allow the menu to be extended + echo elgg_view("editmenu",array('entity' => $vars['entity'])); + + ?> + +

+
+
+ + diff --git a/mod/blog/views/default/river/object/blog/annotate.php b/mod/blog/views/default/river/object/blog/annotate.php new file mode 100644 index 000000000..77b75c6d9 --- /dev/null +++ b/mod/blog/views/default/river/object/blog/annotate.php @@ -0,0 +1,13 @@ +getSubject(); + $object = $statement->getObject(); + + $url = "getURL()}\">{$performed_by->name}"; + $string = sprintf(elgg_echo("blog:river:posted"),$url) . " "; + $string .= elgg_echo("blog:river:annotate:create") . " getURL() . "\">" . $object->title . ""; + +?> + + \ No newline at end of file diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php new file mode 100644 index 000000000..b5b3dc2e4 --- /dev/null +++ b/mod/blog/views/default/river/object/blog/create.php @@ -0,0 +1,20 @@ +subject_guid); // $statement->getSubject(); + $object = get_entity($vars['item']->object_guid); + $url = $object->getURL(); + + $url = "getURL()}\">{$performed_by->name}"; + $contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view + $string = sprintf(elgg_echo("blog:river:created"),$url) . " "; + $string .= elgg_echo("blog:river:create") . " getURL() . "\">" . $object->title . ""; + $string .= "
"; + if(strlen($contents) > 200) { + $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "..."; + }else{ + $string .= $contents; + } + $string .= "
"; +?> + + \ No newline at end of file diff --git a/mod/blog/views/default/river/object/blog/update.php b/mod/blog/views/default/river/object/blog/update.php new file mode 100644 index 000000000..cf98afa8b --- /dev/null +++ b/mod/blog/views/default/river/object/blog/update.php @@ -0,0 +1,13 @@ +subject_guid); // $statement->getSubject(); + $object = get_entity($vars['item']->object_guid); + $url = $object->getURL(); + + $url = "getURL()}\">{$performed_by->name}"; + $string = sprintf(elgg_echo("blog:river:updated"),$url) . " "; + $string .= elgg_echo("blog:river:update") . " getURL() . "\">" . $object->title . ""; + +?> + + \ No newline at end of file -- cgit v1.2.3