aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--entities/index.php6
-rw-r--r--mod/file/edit.php6
-rw-r--r--mod/file/friends.php12
-rw-r--r--mod/file/index.php12
-rw-r--r--mod/file/languages/en.php4
-rw-r--r--mod/file/search.php14
-rw-r--r--mod/file/start.php48
-rw-r--r--mod/file/upload.php6
-rw-r--r--mod/file/views/default/file/css.php161
-rw-r--r--mod/file/views/default/file/groupprofile_files.php15
-rw-r--r--mod/file/views/default/file/typecloud.php89
-rw-r--r--mod/file/views/default/file/upload.php6
-rw-r--r--mod/file/views/default/object/file.php32
-rw-r--r--mod/file/world.php8
-rw-r--r--mod/profile/views/default/profile/css.php4
-rw-r--r--mod/search/views/default/search/gallery.php2
-rw-r--r--mod/tinymce/views/default/tinymce/css.php1
-rw-r--r--views/default/css.php3
-rw-r--r--views/default/entities/gallery.php2
-rw-r--r--views/default/navigation/site_nav.php2
20 files changed, 180 insertions, 253 deletions
diff --git a/entities/index.php b/entities/index.php
index 9242ead53..68018bfff 100644
--- a/entities/index.php
+++ b/entities/index.php
@@ -40,11 +40,11 @@ if ($entity = get_entity($guid)) {
} else if ($entity instanceof ElggEntity) {
$title = $entity->name;
}
- $area2 = elgg_view_entity($entity,true);
+ $area1 = elgg_view_entity($entity,true);
if ($shell) {
- $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+ $body = elgg_view_layout('one_column_with_sidebar', $area1);
} else {
- $body = $area2;
+ $body = $area1;
}
} else {
$body = elgg_echo('notfound');
diff --git a/mod/file/edit.php b/mod/file/edit.php
index 9dfc12eea..c7b823947 100644
--- a/mod/file/edit.php
+++ b/mod/file/edit.php
@@ -34,8 +34,8 @@ if (!$file->canEdit()) {
}
$title = elgg_echo('file:edit');
-$area2 = elgg_view_title($title);
-$area2 .= elgg_view("file/upload", array('entity' => $file));
+$area1 = elgg_view_title($title);
+$area1 .= elgg_view("file/upload", array('entity' => $file));
-$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+$body = elgg_view_layout('one_column_with_sidebar', $area1);
page_draw($title, $body);
diff --git a/mod/file/friends.php b/mod/file/friends.php
index 71dd2b10a..eff4a4aa0 100644
--- a/mod/file/friends.php
+++ b/mod/file/friends.php
@@ -17,23 +17,21 @@
$owner = page_owner_entity();
$title = sprintf(elgg_echo("file:friends"),$owner->name);
-
- $area2 = elgg_view_title($title);
-
+ $area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
set_context('search');
// offset is grabbed in list_user_friends_objects
$content = list_user_friends_objects($owner->guid, 'file', 10, false);
set_context('file');
- $area1 = get_filetype_cloud($owner->guid, true);
+ $area1 .= get_filetype_cloud($owner->guid, true);
// handle case where friends don't have any files
if (empty($content)) {
- $area2 .= elgg_view('page_elements/contentwrapper',array('body' => elgg_echo("file:none")));
+ $area2 .= "<p class='margin_top'>".elgg_echo("file:none")."</p>";
} else {
$area2 .= $content;
}
-
- $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+ $content = "<div class='files'>".$area1.$area2."</div>";
+ $body = elgg_view_layout('one_column_with_sidebar', $content);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/mod/file/index.php b/mod/file/index.php
index af3d4c471..e05f98eb2 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -20,11 +20,11 @@
//set the title
if (page_owner() == get_loggedin_userid()) {
$title = elgg_echo('file:yours');
+ $area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file'));
} else {
$title = sprintf(elgg_echo("file:user"),page_owner_entity()->name);
+ $area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
}
-
- $area2 = elgg_view_title($title);
// Get objects
set_context('search');
@@ -33,12 +33,12 @@
set_context('file');
$get_filter = get_filetype_cloud(page_owner());
if ($get_filter) {
- $area1 = $get_filter;
+ $area1 .= $get_filter;
} else {
- $area2 .= elgg_view('page_elements/contentwrapper',array('body' => elgg_echo("file:none")));
+ $area2 .= "<p class='margin_top'>".elgg_echo("file:none")."</p>";
}
-
- $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+ $content = "<div class='files'>".$area1.$area2."</div>";
+ $body = elgg_view_layout('one_column_with_sidebar', $content);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
index ac3795cfb..619434e66 100644
--- a/mod/file/languages/en.php
+++ b/mod/file/languages/en.php
@@ -15,7 +15,7 @@
*/
'file' => "Files",
- 'files' => "Files",
+ 'files' => "My Files",
'file:yours' => "Your files",
'file:yours:friends' => "Your friends' files",
'file:user' => "%s's files",
@@ -33,7 +33,7 @@
'file:upload' => "Upload a file",
'file:replace' => 'Replace file content (leave blank to not change file)',
- 'file:newupload' => 'New file upload',
+ 'file:new' => 'Upload a file',
'file:file' => "File",
'file:title' => "Title",
diff --git a/mod/file/search.php b/mod/file/search.php
index ea85e862d..9907b02e3 100644
--- a/mod/file/search.php
+++ b/mod/file/search.php
@@ -50,14 +50,18 @@
if (empty($tag)) {
$title = elgg_echo('file:type:all');
$area2 = elgg_view_title(elgg_echo('file:type:all'));
+ $area2 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
} else {
$title = sprintf(elgg_echo('searchtitle'),$tag);
if (is_array($owner_guid)) {
- $area2 = elgg_view_title(elgg_echo("file:friends:type:" . $tag));
+ //$area2 = elgg_view_title(elgg_echo("file:friends:type:" . $tag));
+ $area2 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
} else if (page_owner() && page_owner() != $_SESSION['guid']) {
- $area2 = elgg_view_title(sprintf(elgg_echo("file:user:type:" . $tag),page_owner_entity()->name));
+ //$area2 = elgg_view_title(sprintf(elgg_echo("file:user:type:" . $tag),page_owner_entity()->name));
+ $area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file'));
} else{
- $area2 = elgg_view_title(elgg_echo("file:type:" . $tag));
+ //$area2 = elgg_view_title(elgg_echo("file:type:" . $tag));
+ $area2 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
}
}
if ($friends) {
@@ -82,7 +86,9 @@
set_context("file");
- $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+ $content = "<div class='files'>".$area1.$area2."</div>";
+
+ $body = elgg_view_layout('one_column_with_sidebar', $content);
page_draw($title, $body);
diff --git a/mod/file/start.php b/mod/file/start.php
index b6af2fb18..bd0389106 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -11,17 +11,14 @@
/**
* Override the ElggFile so that
*/
- class FilePluginFile extends ElggFile
- {
- protected function initialise_attributes()
- {
+ class FilePluginFile extends ElggFile {
+ protected function initialise_attributes() {
parent::initialise_attributes();
$this->attributes['subtype'] = "file";
}
- public function __construct($guid = null)
- {
+ public function __construct($guid = null) {
parent::__construct($guid);
}
}
@@ -30,15 +27,12 @@
/**
* File plugin initialisation functions.
*/
- function file_init()
- {
+ function file_init() {
global $CONFIG;
- // Set up menu (tools dropdown or other uses as defined by theme)
+ // Set up menu (tools dropdown)
if (isloggedin()) {
- add_menu(elgg_echo('file'), $CONFIG->wwwroot . "pg/file/" . get_loggedin_user()->username);
- } else {
- add_menu(elgg_echo('file'), $CONFIG->wwwroot . "pg/file/world/world/" );
+ add_menu(elgg_echo('files'), $CONFIG->wwwroot . "pg/file/" . get_loggedin_user()->username);
}
// Extend CSS
@@ -90,23 +84,6 @@
add_submenu_item(sprintf(elgg_echo("file:group"),$page_owner->name), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
}
}
-
- // General submenu options
-
- if (get_context() == "file") {
- if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) {
- add_submenu_item(sprintf(elgg_echo("file:yours"),$page_owner->name), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
- add_submenu_item(sprintf(elgg_echo('file:yours:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/file/". $page_owner->username . "/friends/");
- } else if (page_owner()) {
- add_submenu_item(sprintf(elgg_echo("file:user"),$page_owner->name), $CONFIG->wwwroot . "pg/file/" . $page_owner->username);
- if ($page_owner instanceof ElggUser) // This one's for users, not groups
- add_submenu_item(sprintf(elgg_echo('file:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/file/". $page_owner->username . "/friends/");
- }
- add_submenu_item(elgg_echo('file:all'), $CONFIG->wwwroot . "pg/file/world/world/");
- if (can_write_to_container($_SESSION['guid'], page_owner()) && isloggedin())
- add_submenu_item(elgg_echo('file:upload'), $CONFIG->wwwroot . "pg/file/". $page_owner->username . "/new/");
- }
-
}
/**
@@ -123,10 +100,8 @@
set_input('username',$page[0]);
}
- if (isset($page[1]))
- {
- switch($page[1])
- {
+ if (isset($page[1])) {
+ switch($page[1]) {
case "read":
set_input('guid',$page[2]);
include(dirname(dirname(dirname(__FILE__))) . "/entities/index.php");
@@ -141,9 +116,7 @@
include($CONFIG->pluginspath . "file/upload.php");
break;
}
- }
- else
- {
+ } else {
// Include the standard profile index
include($CONFIG->pluginspath . "file/index.php");
}
@@ -158,8 +131,7 @@
* @param unknown_type $returnvalue
* @param unknown_type $params
*/
- function file_notify_message($hook, $entity_type, $returnvalue, $params)
- {
+ function file_notify_message($hook, $entity_type, $returnvalue, $params) {
$entity = $params['entity'];
$to_entity = $params['to_entity'];
$method = $params['method'];
diff --git a/mod/file/upload.php b/mod/file/upload.php
index d0b503e0c..7aa0553ca 100644
--- a/mod/file/upload.php
+++ b/mod/file/upload.php
@@ -18,9 +18,9 @@
// Render the file upload page
$container_guid = page_owner();
- $area2 = elgg_view_title($title = elgg_echo('file:upload'));
- $area2 .= elgg_view("file/upload", array('container_guid' => $container_guid));
- $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+ $area1 = elgg_view_title($title = elgg_echo('file:upload'));
+ $area1 .= elgg_view("file/upload", array('container_guid' => $container_guid));
+ $body = elgg_view_layout('one_column_with_sidebar', $area1);
page_draw(elgg_echo("file:upload"), $body);
diff --git a/mod/file/views/default/file/css.php b/mod/file/views/default/file/css.php
index 64642d9de..d6f94b61d 100644
--- a/mod/file/views/default/file/css.php
+++ b/mod/file/views/default/file/css.php
@@ -9,8 +9,67 @@
* @link http://elgg.org/
*/
?>
+.files .entity_listing .entity_listing_info {
+ width:453px;
+}
+.files .entity_listing:hover {
+ background-color: white;
+}
+
+
+
+/* files - gallery view */
+.entity_gallery_item .filerepo_gallery_item {
+ margin:10px 10px 0 0;
+ padding:5px;
+ text-align:center;
+ background-color: #eeeeee;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ width:165px;
+}
+.entity_gallery_item .filerepo_gallery_item:hover {
+ background-color: #333333;
+}
+.filerepo_download,
+.filerepo_controls {
+ padding:0 0 1px 0;
+ margin:0 0 10px 0;
+}
+.entity_gallery .filerepo_title {
+ font-weight: bold;
+ line-height: 1.1em;
+ margin:0 0 10px 0;
+}
+.filerepo_gallery_item p {
+ margin:0;
+ padding:0;
+}
+.filerepo_gallery_item .filerepo_controls {
+ margin-top:10px;
+}
+.filerepo_gallery_item .filerepo_controls a {
+ padding-right:10px;
+ padding-left:10px;
+}
+.entity_gallery .filerepo_comments {
+ font-size:90%;
+}
+.filerepo_user_gallery_link {
+ float:right;
+ margin:5px 5px 5px 50px;
+}
+.filerepo_user_gallery_link a {
+ padding:2px 25px 5px 0;
+ background: transparent url(<?php echo $vars['url']; ?>_graphics/icon_gallery.gif) no-repeat right top;
+ display:block;
+}
+.filerepo_user_gallery_link a:hover {
+ background-position: right -40px;
+}
+/*
p.filerepo_owner {
margin:0;
padding:0;
@@ -47,8 +106,10 @@ p.filerepo_owner {
color:white;
text-decoration: none;
}
+*/
/* FILE REPRO WIDGET VIEW */
+/*
.filerepo_widget_singleitem {
margin:0 0 5px 0;
padding:5px;
@@ -97,8 +158,10 @@ p.filerepo_owner {
margin:0 10px 0 10px;
background: none;
}
+*/
/* widget gallery view */
+/*
#filerepo_widget_layout .filerepo_widget_galleryview {
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
@@ -113,59 +176,10 @@ p.filerepo_owner {
.filerepo_widget_galleryview img:hover {
border:1px solid #333333;
}
+*/
-/* SINGLE ITEM VIEW */
-.filerepo_file {
- background:white;
- margin:10px 10px 0 10px;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
-}
-.filerepo_file .filerepo_title_owner_wrapper {
- min-height:60px;
-
-}
-.filerepo_title_owner_wrapper .filerepo_title,
-.filerepo_title_owner_wrapper .filerepo_owner {
- margin-left: 70px !important;
-}
-.filerepo_file .filerepo_maincontent {
- padding:0 20px 0 0;
-}
-.filerepo_file .filerepo_icon {
- width: 70px;
- position: absolute;
- margin:10px 0 10px 10px;
-}
-.filerepo_file .filerepo_title {
- margin:0;
- padding:7px 4px 10px 10px;
- line-height: 1.2em;
-}
-.filerepo_file .filerepo_owner {
- padding:0 0 0 10px;
-}
-.filerepo_file .filerepo_description {
- margin:10px 0 0 0;
- padding:0 0 0 10px;
-}
-.filerepo_download,
-.filerepo_controls {
- padding:0 0 1px 10px;
- margin:0 0 10px 0;
-}
-.filerepo_file .filerepo_description p {
- padding:0 0 5px 0;
- margin:0;
-}
-.filerepo_file .filerepo_specialcontent img {
- padding:10px;
- margin:0 0 0 10px;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- background: black;
-}
/* zaudio player */
+/*
.filerepo_maincontent .filerepo_specialcontent {
margin:0 0 20px 0;
}
@@ -173,52 +187,9 @@ p.filerepo_owner {
padding:0 0 10px 10px;
margin:0;
}
+*/
-/* file repro gallery items */
-.search_gallery .filerepo_controls {
- padding:0;
-}
-.search_gallery .filerepo_title {
- font-weight: bold;
- line-height: 1.1em;
- margin:0 0 10px 0;
-}
-.filerepo_gallery_item {
- margin:0;
- padding:0;
- text-align:center;
-
-}
-.filerepo_gallery_item p {
- margin:0;
- padding:0;
-}
-.filerepo_gallery_item .filerepo_controls {
- margin-top:10px;
-}
-.filerepo_gallery_item .filerepo_controls a {
- padding-right:10px;
- padding-left:10px;
-}
-.search_gallery .filerepo_comments {
- font-size:90%;
-}
-
-.filerepo_user_gallery_link {
- float:right;
- margin:5px 5px 5px 50px;
-}
-.filerepo_user_gallery_link a {
- padding:2px 25px 5px 0;
- background: transparent url(<?php echo $vars['url']; ?>_graphics/icon_gallery.gif) no-repeat right top;
- display:block;
-}
-.filerepo_user_gallery_link a:hover {
- background-position: right -40px;
-}
-/* IE6 */
-* html #description_tbl { width:676px !important;}
diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php
index 778de3301..444398522 100644
--- a/mod/file/views/default/file/groupprofile_files.php
+++ b/mod/file/views/default/file/groupprofile_files.php
@@ -1,20 +1,18 @@
<?php
- // Latest forum discussion for the group home page
+ // Files on group profile page
- //check to make sure this group forum has been activated
+ //check to make sure group files is activated
if($vars['entity']->files_enable != 'no'){
?>
<script type="text/javascript">
$(document).ready(function () {
-
-$('a.show_file_desc').click(function () {
- $(this.parentNode).children("[class=filerepo_listview_desc]").slideToggle("fast");
- return false;
-});
-
+ $('a.show_file_desc').click(function () {
+ $(this.parentNode).children("[class=filerepo_listview_desc]").slideToggle("fast");
+ return false;
+ });
}); /* end document ready function */
</script>
@@ -66,7 +64,6 @@ $('a.show_file_desc').click(function () {
}
?>
-<div class="clearfloat" /></div>
</div>
<?php
diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
index b85960849..5ac831cfe 100644
--- a/mod/file/views/default/file/typecloud.php
+++ b/mod/file/views/default/file/typecloud.php
@@ -4,64 +4,53 @@
if (is_array($vars['types']) && sizeof($vars['types'])) {
-?>
-
- <!-- <div class="filerepo_types"> -->
- <!-- <p><b><?php echo elgg_echo('file:types'); ?>:</b> -->
-
- <div id="canvas_header_submenu">
- <ul>
+?>
+<ul>
<?php
- $all = new stdClass;
- $all->tag = "all";
- $vars['types'][] = $all;
- $vars['types'] = array_reverse($vars['types']);
- foreach($vars['types'] as $type) {
+ $all = new stdClass;
+ $all->tag = "all";
+ $vars['types'][] = $all;
+ $vars['types'] = array_reverse($vars['types']);
+ foreach($vars['types'] as $type) {
- $tag = $type->tag;
- if ($tag != "all") {
- $label = elgg_echo("file:type:" . $tag);
- } else {
- $label = elgg_echo('all');
- }
-
- $url = $vars['url'] . "mod/file/search.php?subtype=file";
- if ($tag != "all")
- $url .= "&md_type=simpletype&tag=" . urlencode($tag);
- if (isset($vars['friend_guid']) && $vars['friend_guid'] != false) {
- $url .= "&friends_guid={$vars['friend_guid']}";
- } else if ($vars['owner_guid'] != "") {
- if (is_array($vars['owner_guid'])) {
- $owner_guid = implode(",",$vars['owner_guid']);
- } else {
- $owner_guid = $vars['owner_guid'];
- }
- $url .= "&owner_guid={$owner_guid}";
- }
- if ($tag == "image")
- $url .= "&search_viewtype=gallery";
-
- $url .= "&page_owner=" . page_owner();
-
- $inputtag = get_input('tag');
- if ($inputtag == $tag || (empty($inputtag) && $tag == "all")) {
- // $class = "class=\"filerepo_types_current\"";
- $class = " class=\"selected\" ";
+ $tag = $type->tag;
+ if ($tag != "all") {
+ $label = elgg_echo("file:type:" . $tag);
+ } else {
+ $label = elgg_echo('all');
+ }
+
+ $url = $vars['url'] . "mod/file/search.php?subtype=file";
+ if ($tag != "all")
+ $url .= "&md_type=simpletype&tag=" . urlencode($tag);
+ if (isset($vars['friend_guid']) && $vars['friend_guid'] != false) {
+ $url .= "&friends_guid={$vars['friend_guid']}";
+ } else if ($vars['owner_guid'] != "") {
+ if (is_array($vars['owner_guid'])) {
+ $owner_guid = implode(",",$vars['owner_guid']);
} else {
- $class = "";
+ $owner_guid = $vars['owner_guid'];
}
-
- add_submenu_item($label, $url, 'filetypes');
-
- //echo "<li {$class} ><a href=\"{$url}\">{$label}</a></li>";
-
+ $url .= "&owner_guid={$owner_guid}";
}
+ if ($tag == "image")
+ $url .= "&search_viewtype=gallery";
+ $url .= "&page_owner=" . page_owner();
+
+ $inputtag = get_input('tag');
+ if ($inputtag == $tag || (empty($inputtag) && $tag == "all")) {
+ $class = " class=\"selected\" ";
+ } else {
+ $class = "";
+ }
+
+ add_submenu_item($label, $url, 'filetypes');
+ }
+
?>
- <!-- </p> -->
- </ul>
- </div>
+</ul>
<?php
diff --git a/mod/file/views/default/file/upload.php b/mod/file/views/default/file/upload.php
index 5a1f5c927..065b0eb3f 100644
--- a/mod/file/views/default/file/upload.php
+++ b/mod/file/views/default/file/upload.php
@@ -41,8 +41,7 @@
?>
-<div class="contentWrapper">
-<form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" enctype="multipart/form-data" method="post">
+<form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" enctype="multipart/form-data" method="post" class="margin_top">
<p>
<label>
<?php
@@ -130,5 +129,4 @@
<input type="submit" value="<?php echo elgg_echo("save"); ?>" />
</p>
-</form>
-</div>
+</form> \ No newline at end of file
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 9568074b2..da555772d 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -28,21 +28,21 @@
if (get_context() == "search") { // Start search listing version
if (get_input('search_viewtype') == "gallery") {
- echo "<div class=\"filerepo_gallery_item\">";
+ echo "<div class='filerepo_gallery_item'>";
if ($vars['entity']->smallthumb) {
- echo "<p class=\"filerepo_title\">" . $file->title . "</p>";
+ echo "<p class='filerepo_title'>" . $file->title . "</p>";
echo "<p><a href=\"{$file->getURL()}\"><img src=\"{$vars['url']}mod/file/thumbnail.php?size=medium&file_guid={$vars['entity']->getGUID()}\" border=\"0\" /></a></p>";
- echo "<p class=\"filerepo_timestamp\"><small><a href=\"{$vars['url']}pg/file/{$owner->username}\">{$owner->username}</a> {$friendlytime}</small></p>";
+ echo "<p class='filerepo_timestamp'><small><a href=\"{$vars['url']}pg/file/{$owner->username}\">{$owner->username}</a> {$friendlytime}</small></p>";
//get the number of comments
$numcomments = elgg_count_comments($vars['entity']);
if ($numcomments)
- echo "<p class=\"filerepo_comments\"><a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a></p>";
+ echo "<p class='filerepo_comments'><a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a></p>";
//if the user can edit, display edit and delete links
if ($file->canEdit()) {
- echo "<div class=\"filerepo_controls\"><p>";
+ echo "<div class='filerepo_controls'><p>";
echo "<a href=\"{$vars['url']}mod/file/edit.php?file_guid={$file->getGUID()}\">" . elgg_echo('edit') . "</a>&nbsp;";
echo elgg_view('output/confirmlink',array(
@@ -57,36 +57,32 @@
} else {
- echo "<p class=\"filerepo_title\">{$title}</p>";
+ echo "<p class='filerepo_title'>{$title}</p>";
echo "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'large')) . "</a>";
- echo "<p class=\"filerepo_timestamp\"><small><a href=\"{$vars['url']}pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}</small></p>";
+ echo "<p class='filerepo_timestamp'><small><a href=\"{$vars['url']}pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}</small></p>";
//get the number of comments
$numcomments = elgg_count_comments($file);
if ($numcomments)
- echo "<p class=\"filerepo_comments\"><a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a></p>";
-
+ echo "<p class='filerepo_comments'><a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a></p>";
}
echo "</div>";
- // echo elgg_view("search/gallery",array('info' => $info, 'icon' => $icon));
} else {
- $info = "<p> <a href=\"{$file->getURL()}\">{$title}</a></p>";
- $info .= "<p class=\"owner_timestamp\"><a href=\"{$vars['url']}pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
+ $info = "<p class='entity_title'> <a href=\"{$file->getURL()}\">{$title}</a></p>";
+ $info .= "<p class='entity_subtext'><a href=\"{$vars['url']}pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
$numcomments = elgg_count_comments($file);
if ($numcomments)
$info .= ", <a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a>";
$info .= "</p>";
-
- // $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'small'));
$icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'small')) . "</a>";
echo elgg_view_listing($icon, $info);
}
- } else { // Start main version
+ } else { // Start main version
?>
<div class="filerepo_file">
@@ -151,14 +147,14 @@
</div>
<?php
if (elgg_view_exists('file/specialcontent/' . $mime)) {
- echo "<div class=\"filerepo_specialcontent\">".elgg_view('file/specialcontent/' . $mime, $vars)."</div>";
+ echo "<div class='filerepo_specialcontent'>".elgg_view('file/specialcontent/' . $mime, $vars)."</div>";
} else if (elgg_view_exists("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default")) {
- echo "<div class=\"filerepo_specialcontent\">".elgg_view("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default", $vars)."</div>";
+ echo "<div class='filerepo_specialcontent'>".elgg_view("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default", $vars)."</div>";
}
?>
- <div class="filerepo_download"><p><a href="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("file:download"); ?></a></p></div>
+ <div class="filerepo_download"><p><a class="action_button small" href="<?php echo $vars['url']; ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("file:download"); ?></a></p></div>
<?php
diff --git a/mod/file/world.php b/mod/file/world.php
index 9f2ae5ee4..bd39d2a08 100644
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -24,16 +24,18 @@
$title = elgg_echo('file:all');
// Get objects
- $area2 = elgg_view_title($title);
- $area1 = get_filetype_cloud(); // the filter
+ $area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
+ $area1 .= get_filetype_cloud(); // the filter
set_context('search');
if ($tag != "")
$area2 .= list_entities_from_metadata('tags',$tag,'object','file',0,10,false);
else
$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE));
set_context('file');
+
+ $content = "<div class='files'>".$area1.$area2."</div>";
- $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+ $body = elgg_view_layout('one_column_with_sidebar', $content);
// Finally draw the page
page_draw($title, $body);
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index 254c9bed2..ed5b050b3 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -370,8 +370,8 @@ div.usericon a.icon img {
.usericon .sub_menu h3 {
font-size:1.3em;
line-height: 1.1em;
- padding:0;
- margin:0;
+ padding:0 !important;
+ margin:0 !important;
border-bottom:solid 1px #dddddd;
color: #4690d6;
}
diff --git a/mod/search/views/default/search/gallery.php b/mod/search/views/default/search/gallery.php
index 753a38684..f921a75e3 100644
--- a/mod/search/views/default/search/gallery.php
+++ b/mod/search/views/default/search/gallery.php
@@ -27,7 +27,7 @@
echo "<tr>";
}
- echo "<td class=\"entity_gallery_item\">";
+ echo "<td class='entity_gallery_item'>";
$ev = elgg_view_entity($entity, $fullview);
diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
index 238439a4b..dd9aef4a3 100644
--- a/mod/tinymce/views/default/tinymce/css.php
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -47,4 +47,5 @@ border: 1px solid #CCC;
}
.toggle_editor {
float:right;
+ margin-top:-15px;
} \ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index 287fe3100..0ce9d0dde 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1117,9 +1117,6 @@ select.styled .select_option {
height: 200px;
width:718px;
}
-.longtext_editarea {
- margin:0;
-}
input[type="checkbox"] {
margin:0 3px 0 0;
padding:0;
diff --git a/views/default/entities/gallery.php b/views/default/entities/gallery.php
index a2701ed0c..73cab6dd8 100644
--- a/views/default/entities/gallery.php
+++ b/views/default/entities/gallery.php
@@ -24,7 +24,7 @@ if (is_array($entities) && sizeof($entities) > 0) {
echo "<tr>";
}
- echo "<td class=\"entity_gallery_item\">";
+ echo "<td class='entity_gallery_item'>";
echo elgg_view_entity($entity);
echo "</td>";
$col++;
diff --git a/views/default/navigation/site_nav.php b/views/default/navigation/site_nav.php
index de37038cf..336330578 100644
--- a/views/default/navigation/site_nav.php
+++ b/views/default/navigation/site_nav.php
@@ -39,7 +39,7 @@ if(is_plugin_enabled('file')){
$selected = 'class="selected"';
else
$selected = "";
- echo "<li {$selected}><a href=\"{$vars['url']}mod/file/all.php\" id='files'><span>Files</span></a></li>";
+ echo "<li {$selected}><a href=\"{$vars['url']}pg/file/world/world/\" id='files'><span>Files</span></a></li>";
}
if(is_plugin_enabled('bookmarks')){
if(get_context() == 'bookmarks')
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 04:59:37 +0000