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/pages/views/default/pages/breadcrumbs.php | 28 ++++ mod/pages/views/default/pages/css.php | 146 +++++++++++++++++++++ .../views/default/pages/groupprofile_pages.php | 27 ++++ mod/pages/views/default/pages/menu.php | 14 ++ mod/pages/views/default/pages/metatags.php | 22 ++++ mod/pages/views/default/pages/pagegallery.php | 37 ++++++ mod/pages/views/default/pages/pagelisting.php | 38 ++++++ mod/pages/views/default/pages/pageprofile.php | 83 ++++++++++++ .../views/default/pages/sidebar/sidebarthis.php | 92 +++++++++++++ mod/pages/views/default/pages/sidebar/starter.php | 21 +++ mod/pages/views/default/pages/sidebar/tree.php | 8 ++ mod/pages/views/default/pages/sidebar/wrapper.php | 7 + mod/pages/views/default/pages/welcome.php | 29 ++++ 13 files changed, 552 insertions(+) create mode 100644 mod/pages/views/default/pages/breadcrumbs.php create mode 100644 mod/pages/views/default/pages/css.php create mode 100644 mod/pages/views/default/pages/groupprofile_pages.php create mode 100644 mod/pages/views/default/pages/menu.php create mode 100644 mod/pages/views/default/pages/metatags.php create mode 100644 mod/pages/views/default/pages/pagegallery.php create mode 100644 mod/pages/views/default/pages/pagelisting.php create mode 100644 mod/pages/views/default/pages/pageprofile.php create mode 100644 mod/pages/views/default/pages/sidebar/sidebarthis.php create mode 100644 mod/pages/views/default/pages/sidebar/starter.php create mode 100644 mod/pages/views/default/pages/sidebar/tree.php create mode 100644 mod/pages/views/default/pages/sidebar/wrapper.php create mode 100644 mod/pages/views/default/pages/welcome.php (limited to 'mod/pages/views/default/pages') diff --git a/mod/pages/views/default/pages/breadcrumbs.php b/mod/pages/views/default/pages/breadcrumbs.php new file mode 100644 index 000000000..c7e1bfb83 --- /dev/null +++ b/mod/pages/views/default/pages/breadcrumbs.php @@ -0,0 +1,28 @@ +wwwroot . "pg/pages/owned/" . get_entity($page_owner)->username; + echo "
" . elgg_echo('pages:user') . ""; + + //see if the new page's parent has a parent + $getparent = get_entity($parent->parent_guid); + while ($getparent instanceof ElggObject){ + + $breadcrumbs = " > getURL()}\">$getparent->title" . $breadcrumbs; + $getparent = get_entity($getparent->parent_guid); + + } + + echo $breadcrumbs; + //if it is adding a page, make the last page a link, otherwise, don't + if($vars['add']){ + echo " > getURL()}\">$parent->title
"; + }else{ + echo " > $parent->title"; + } + +?> \ No newline at end of file diff --git a/mod/pages/views/default/pages/css.php b/mod/pages/views/default/pages/css.php new file mode 100644 index 000000000..c396d45f7 --- /dev/null +++ b/mod/pages/views/default/pages/css.php @@ -0,0 +1,146 @@ + + +.treeview, .treeview ul { + padding: 0; + margin: 0; + list-style: none; +} + +.treeview ul { + background-color: white; + margin-top: 4px; +} + +.treeview .hitarea { + background: url(mod/pages/images/treeview-default.gif) -64px -25px no-repeat; + height: 16px; + width: 16px; + margin-left: -16px; + float: left; + cursor: pointer; +} +/* fix for IE6 */ +* html .hitarea { + display: inline; + float:none; +} + +.treeview li { + margin: 0; + padding: 3px 0pt 3px 16px; +} + +.treeview a.selected { + background-color: #eee; +} + +#treecontrol { margin: 1em 0; display: none; } + +.treeview .hover { color: red; cursor: pointer; } + +.treeview li { background: url(mod/pages/images/treeview-default-line.gif) 0 0 no-repeat; } +.treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; } + +.treeview .expandable-hitarea { background-position: -80px -3px; } + +.treeview li.last { background-position: 0 -1766px } +.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(mod/pages/images/treeview-default.gif); } +.treeview li.lastCollapsable { background-position: 0 -111px } +.treeview li.lastExpandable { background-position: -32px -67px } + +.treeview div.lastCollapsable-hitarea, .treeview div.lastExpandable-hitarea { background-position: 0; } + +.treeview-red li { background-image: url(mod/pages/images/treeview-red-line.gif); } +.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(mod/pages/images/treeview-red.gif); } + +.treeview-black li { background-image: url(mod/pages/images/treeview-black-line.gif); } +.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(mod/pages/images/treeview-black.gif); } + +.treeview-gray li { background-image: url(mod/pages/images/treeview-gray-line.gif); } +.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(mod/pages/images/treeview-gray.gif); } + +.treeview-famfamfam li { background-image: url(mod/pages/images/treeview-famfamfam-line.gif); } +.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(mod/pages/images/treeview-famfamfam.gif); } + + +.filetree li { padding: 3px 0 2px 16px; } +.filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; } +.filetree span.folder { background: url(mod/pages/images/folder.gif) 0 0 no-repeat; } +.filetree li.expandable span.folder { background: url(mod/pages/images/folder-closed.gif) 0 0 no-repeat; } +.filetree span.file { background: url(mod/pages/images/file.gif) 0 0 no-repeat; } + +.pagesTreeContainer { + margin:0; + min-height: 200px; +} + +#pages_page .strapline { + text-align:right; + border-top:1px solid #efefef; + margin:10px 0 10px 0; + color:#666666; +} +#pages_page .categories { + border:none !important; + padding:0 !important; +} + +#pages_page .tags { + padding:0 0 0 16px; + margin:10px 0 4px 0; + background:transparent url(_graphics/icon_tag.gif) no-repeat scroll left 2px; +} + +#pages_page img[align="left"] { + margin: 10px 20px 10px 0; + float:left; +} +#pages_page img[align="right"] { + margin: 10px 0 10px 10px; + float:right; +} + +.pageswelcome p { + margin:0 0 5px 0; +} + +#sidebar_page_tree { + background:white; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + padding:10px; + margin:0 10px 10px 10px; +} +#sidebar_page_tree h3 { + background: none; + border-top: none; + border-bottom: 1px solid #cccccc; + font-size:1.25em; + line-height:1.2em; + margin:0 0 5px 0; + padding:0 0 5px 5px; + color:#0054A7; +} + +/* IE6 */ +* html #pages_welcome_tbl { width:676px !important;} + +.pages_widget_singleitem_more { + margin:0 10px 0 10px; + padding:5px; + display:block; + background:white; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; +} + + diff --git a/mod/pages/views/default/pages/groupprofile_pages.php b/mod/pages/views/default/pages/groupprofile_pages.php new file mode 100644 index 000000000..a1da4bd6b --- /dev/null +++ b/mod/pages/views/default/pages/groupprofile_pages.php @@ -0,0 +1,27 @@ +pages_enable != 'no'){ + +?> + +
+

+ 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => 5, 'full_view' => FALSE)); + + if($objects) + echo $objects; + else + echo "
" . elgg_echo("pages:nogroup") . "
"; + +?> +
+
+ + \ No newline at end of file diff --git a/mod/pages/views/default/pages/menu.php b/mod/pages/views/default/pages/menu.php new file mode 100644 index 000000000..7b2df4c90 --- /dev/null +++ b/mod/pages/views/default/pages/menu.php @@ -0,0 +1,14 @@ + +

+ +

\ No newline at end of file diff --git a/mod/pages/views/default/pages/metatags.php b/mod/pages/views/default/pages/metatags.php new file mode 100644 index 000000000..82b291e2c --- /dev/null +++ b/mod/pages/views/default/pages/metatags.php @@ -0,0 +1,22 @@ + + + + + diff --git a/mod/pages/views/default/pages/pagegallery.php b/mod/pages/views/default/pages/pagegallery.php new file mode 100644 index 000000000..84d95b53b --- /dev/null +++ b/mod/pages/views/default/pages/pagegallery.php @@ -0,0 +1,37 @@ + $vars['entity'], + 'size' => 'medium', + ) + ); + + $info = "

getUrl() . "\">" . $vars['entity']->title . "

"; + + + $latest = $vars['entity']->getAnnotations('page', 1, 0, 'desc'); + if ($latest) { + $latest = $latest[0]; + + $time_updated = $latest->time_created; + $owner_guid = $latest->owner_guid; + $owner = get_entity($owner_guid); + + + $info .= "
". + strip_tags(substr($latest->value, 0, 100)) + . "
"; + } + + echo elgg_view_listing($icon, $info); +?> \ No newline at end of file diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php new file mode 100644 index 000000000..806f60c9b --- /dev/null +++ b/mod/pages/views/default/pages/pagelisting.php @@ -0,0 +1,38 @@ + $vars['entity'], + 'size' => 'small', + ) + ); + + $info .= "

getUrl() . "\">" . $vars['entity']->title . "

"; + + + $latest = $vars['entity']->getAnnotations('page', 1, 0, 'desc'); + if ($latest) { + $latest = $latest[0]; + + $time_updated = $latest->time_created; + $owner_guid = $latest->owner_guid; + $owner = get_entity($owner_guid); + + + $info .= "

".sprintf(elgg_echo("pages:strapline"), + friendly_time($time_updated), + "getURL() . "\">" . $owner->name ."" + ) . "

"; + } + + echo elgg_view_listing($icon, $info); +?> \ No newline at end of file diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php new file mode 100644 index 000000000..b879ca7a2 --- /dev/null +++ b/mod/pages/views/default/pages/pageprofile.php @@ -0,0 +1,83 @@ +getAnnotations('page', 1, 0, 'desc'); + if ($latest) $latest = $latest[0]; + } + +?> +
+
+ + /*$entity->description*/ $latest->value)); + + $tags = $vars['entity']->tags; + if (!empty($tags)) { + +?> + +

+ $tags)); + + ?> +

+ + +

+ +

+ + +

+ time_created; + $owner_guid = $latest->owner_guid; + $owner = get_entity($owner_guid); + + echo sprintf(elgg_echo("pages:strapline"), + friendly_time($time_updated), + "getURL() . "\">" . $owner->name ."" + ); + + ?> +

+
+ +
\ No newline at end of file diff --git a/mod/pages/views/default/pages/sidebar/sidebarthis.php b/mod/pages/views/default/pages/sidebar/sidebarthis.php new file mode 100644 index 000000000..47a262501 --- /dev/null +++ b/mod/pages/views/default/pages/sidebar/sidebarthis.php @@ -0,0 +1,92 @@ +[parent_guid; + + $currentpage = (int) get_input('currentpage'); + if ($currentpage) { + + $path = pages_get_path($currentpage); + $pathstring = implode(',',$path); + + } else { + $path = array(); + } + + function pages_draw_child($childentity, $path) { + + $child = "\n\t\t{\n"; + $child .= "\t\t\t\"text\": \"getURL()}\\\">" . addslashes($childentity->title) . "\"\n"; + + $extras = ""; + $haschild = elgg_get_entities_from_metadata(array('metadata_name' => 'parent_guid', 'metadata_value' => $childentity->guid, 'limit' => 9999)); + if ($haschild) { + if (in_array($childentity->guid,$path)) { + $extras .= "\t\t\t,\"expanded\": true"; + $extras .= "\t\t\t,\"children\": [\n"; + + $childstring = ""; + foreach($haschild as $subchild) { + $childstringtemp = pages_draw_child($subchild,$path); + if (!empty($childstringtemp)) { + if (!empty($childstring)) $childstring .= ", "; + $childstring .= $childstringtemp; + } + } + + $extras .= $childstring . "\n\t\t\t]\n"; + } else { + $extras .= ",\t\t\t\"id\": \"{$childentity->getGUID()}\",\n\t\t\t\"hasChildren\": true\n"; + } + + } + $child .= $extras . "\t\t}"; + return $child; + } + + if (!$parent) { + echo "{\n"; + echo "\t\"text\": \"getURL()}\\\">" . addslashes($vars['entity']->title) . "\"\n"; + } + + $children = ""; + $temp = ""; + if (isset($vars['children']) && is_array($vars['children']) && (!isset($vars['fulltree']) || $vars['fulltree'] == 0)) { + if (!$parent) $temp .= "\t" . '"expanded": true,' . "\n"; + if (!$parent) $temp .= "\t" . '"children": [' . "\n"; + foreach($vars['children'] as $child) { + $childrentemp = pages_draw_child($child,$path); + if (!empty($childrentemp)) { + if (!empty($children)) $children .= ", \n"; + $children .= $childrentemp; + } + /* + $children .= "\n\t\t{\n"; + $children .= "\t\t\t\"text\": \"getURL()}\\\">{$child->title}\",\n"; + + $haschild = get_entities_from_metadata('parent_guid',$child->guid,'','',0,10,0,'',0,true); + if ($haschild) { + $children .= "\t\t\t\"id\": \"{$child->getGUID()}\",\n\t\t\t\"hasChildren\": true\n"; + } + $children .= "\t\t}"; + */ + } + if (!empty($temp)) echo ',' . $temp; + echo $children; + if (!$parent) echo "\t\t" . ']' . "\n"; + + } + + if (!$parent) echo "}"; + +?>] \ No newline at end of file diff --git a/mod/pages/views/default/pages/sidebar/starter.php b/mod/pages/views/default/pages/sidebar/starter.php new file mode 100644 index 000000000..4734ca929 --- /dev/null +++ b/mod/pages/views/default/pages/sidebar/starter.php @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file diff --git a/mod/pages/views/default/pages/sidebar/tree.php b/mod/pages/views/default/pages/sidebar/tree.php new file mode 100644 index 000000000..c83e3f682 --- /dev/null +++ b/mod/pages/views/default/pages/sidebar/tree.php @@ -0,0 +1,8 @@ + + +
\ No newline at end of file diff --git a/mod/pages/views/default/pages/sidebar/wrapper.php b/mod/pages/views/default/pages/sidebar/wrapper.php new file mode 100644 index 000000000..ed21b4dd6 --- /dev/null +++ b/mod/pages/views/default/pages/sidebar/wrapper.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/mod/pages/views/default/pages/welcome.php b/mod/pages/views/default/pages/welcome.php new file mode 100644 index 000000000..deefdba30 --- /dev/null +++ b/mod/pages/views/default/pages/welcome.php @@ -0,0 +1,29 @@ +" . $welcome->description . ""; + + } + + } else { + +?> + +

+ + \ No newline at end of file -- cgit v1.2.3