]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
removed unnecessary code
authorcash <cash.costello@gmail.com>
Sat, 1 Oct 2011 18:35:10 +0000 (14:35 -0400)
committercash <cash.costello@gmail.com>
Sat, 1 Oct 2011 18:35:10 +0000 (14:35 -0400)
12 files changed:
mod/embed/views/default/embed/css.php
mod/embed/views/default/embed/embed.php [deleted file]
mod/embed/views/default/embed/item.php
mod/embed/views/default/embed/list.php
mod/embed/views/default/embed/tabs.php [deleted file]
mod/embed/views/default/group/default/embed.php [deleted file]
mod/embed/views/default/js/embed/embed.php
mod/embed/views/default/object/default/embed.php [deleted file]
mod/embed/views/default/object/file/embed.php [deleted file]
mod/embed/views/default/object/file/embedlist.php [deleted file]
mod/embed/views/default/site/default/embed.php [deleted file]
mod/embed/views/default/user/default/embed.php [deleted file]

index 03373da2b866fcc486f4a9f1f962a1615573f8ec..f654a208af1f6d6fb9c8cd074105ecdd38195024 100644 (file)
 .embed-wrapper .elgg-image-block:hover {
        background-color: #eee;
 }
-<?php
-return true;
-?>
-/***************
- Form
-******************/
-/* input field classes */
-.embed-wrapper .elgg-input-text,
-.embed-wrapper .elgg-input-tags {
-       font: 120% Arial, Helvetica, sans-serif;
-       padding: 5px;
-       border: 1px solid #ccc;
-       color:#666;
-       background-color: white;
-
-       -webkit-border-radius: 5px;
-       -moz-border-radius: 5px;
-       border-radius: 5px;
-
-       -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-       box-shadow: none;
-}
-.embed-wrapper .elgg-input-text:focus,
-.embed-wrapper .elgg-input-tags:focus {
-       border: solid 1px #4690d6;
-       background: #e4ecf5;
-       color:#333;
-}
-.embed-wrapper .elgg-input-file {
-       background-color: white;
-}
-
-.embed-wrapper label {
-       color:#333;
-}
-
-
-
-
-#facebox {
-       position: absolute;
-       top: 0;
-       left: 0;
-       z-index: 10000;
-       text-align: left;
-}
-#facebox .popup {
-       position: relative;
-}
-#facebox .body {
-       padding: 10px 15px 20px 15px;
-       background-color: white;
-       width: 730px;
-       min-height:400px;
-       
-       -webkit-border-radius: 8px; 
-       -moz-border-radius: 8px;
-       border-radius: 8px;
-}
-#facebox .loading {
-       text-align: center;
-       padding: 100px 10px 100px 10px;
-}
-#facebox .image {
-       text-align: center;
-}
-#facebox .footer {
-       float: right;
-       width:22px;
-       height:22px;
-       margin:-4px 0 0 0;
-       padding:0;
-}
-#facebox .footer img.close_image {
-       background: url(<?php echo elgg_get_site_url(); ?>mod/embed/images/close_button.gif) no-repeat left top;
-}
-#facebox .footer img.close_image:hover {
-       background: url(<?php echo elgg_get_site_url(); ?>mod/embed/images/close_button.gif) no-repeat left -31px;
-}
-#facebox_overlay {
-       position: fixed;
-       top: 0px;
-       left: 0px;
-       height:100%;
-       width:100%;
-}
-.facebox_hide {
-       z-index:-100;
-}
-.facebox_overlayBG {
-       background-color: #000;
-       z-index: 9999;
-}
-* html #facebox_overlay { /* ie6 hack */
-       position: absolute;
-       height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
-}
-
-#facebox .body .content h2 {
-       color:#333333;
-}
-
-
-/* embeded content links */
-.embeded_file.link {
-       display: inline;
-       margin-right: 5px;
-       padding-left: 14px;
-       background-repeat: no-repeat;
-       
-       -webkit-background-size: 12px 16px;
-       -moz-background-size: 12px 16px; 
-       background-size: 12px 16px;
-}
-
-/* entity listings */
-.embed_data .elgg-image img {
-       cursor: pointer;
-}
-.embed_data .elgg-image-block  {
-       border-bottom:none;
-}
-.embed_modal_videolist .elgg-image img {
-       width:75px;
-       height:auto;
-}
-.embed_modal_document .embed_data .elgg-body {
-       margin-top:0;
-       margin-left:7px;
-}
-.embed_modal_tidypics .embed_data .elgg-body {
-       margin-top:11px;
-}
-.embed_modal_file .embed_data .elgg-body {
-       margin-top:0px;
-       margin-left:9px;
-}
-.embed_data .elgg-body {
-       width:auto;
-       margin-top:15px;
-       margin-left:15px;
-}
-.embed_data .elgg-image-block {
-       cursor:pointer;
-}
-
-/* input field classes */
-#facebox .content .elgg-input-text,
-#facebox .content .elgg-input-tags {
-       font: 120% Arial, Helvetica, sans-serif;
-       padding: 5px;
-       border: 1px solid #ccc;
-       color:#666;
-       background-color: white;
-       
-       -webkit-border-radius: 5px;
-       -moz-border-radius: 5px;
-       border-radius: 5px;
-       
-       -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-       box-shadow: none;
-}
-#facebox .content .elgg-input-text:focus,
-#facebox .content .elgg-input-tags:focus {
-       border: solid 1px #4690d6;
-       background: #e4ecf5;
-       color:#333;
-}
-#facebox .content .elgg-input-file {
-       background-color: white;
-}
-#facebox .content p {
-       color:#333;
-}
-#facebox .content p.entity-title {
-       color:#666;
-}
-#facebox .content .elgg-image-block:hover {
-       background-color: #eee;
-}
-#facebox .content label {
-       color:#333;
-}
-
-
-/* ***************************************
-       ELGG TABBED PAGE NAVIGATION
-*************************************** */
-#facebox .body .elgg-tabs {
-       margin-bottom:5px;
-       padding: 0;
-       border-bottom: 2px solid #ccc;
-       display:table;
-       width:100%;
-}
-#facebox .body .elgg-tabs ul {
-       list-style: none;
-       padding: 0;
-       margin: 0;
-}
-#facebox .body .elgg-tabs li {
-       float: left;
-       border: 2px solid #ccc;
-       border-bottom-width: 0;
-       background: #eee;
-       margin: 0 0 0 10px;
-       
-       -webkit-border-radius:5px 5px 0 0;
-       -moz-border-radius: 5px 5px 0 0;
-       border-raidus: 5px 5px 0 0;
-}
-#facebox .body .elgg-tabs a {
-       text-decoration: none;
-       display: block;
-       padding:3px 10px 0 10px;
-       text-align: center;
-       height:21px;
-       color:#999;
-}
-#facebox .body .elgg-tabs a:hover {
-       background: #dedede;
-       color:#666;
-}
-#facebox .body .elgg-tabs .selected {
-       border-color: #ccc;
-       background: white;
-}
-#facebox .body .elgg-tabs .selected a {
-       position: relative;
-       top: 2px;
-       background: white;
-}
-
-
-
-/* Pagination (override core elgg css defaults) */
-#facebox .body .pagination {
-       float:right;    
-}
-#facebox .body .pagination .pagination-number {
-       border:1px solid #999; 
-       color:#666;
-}
-#facebox .body .pagination .pagination-number:hover {
-       background-color:#aaa; 
-       color:black;
-}
-#facebox .body .pagination .pagination-previous,
-#facebox .body .pagination .pagination-next {
-       border:1px solid #999; 
-       color:#666;
-}
-#facebox .body .pagination .pagination-previous:hover,
-#facebox .body .pagination .pagination-next:hover {
-       background-color:#aaa; 
-       color:black;
-}
-#facebox .body .pagination .pagination-currentpage {
-       background-color:#666; 
-       border:1px solid #666; 
-       color:white;
-}
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
deleted file mode 100644 (file)
index 2bd3296..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Embed landing page
- *
- * @todo Yes this is a lot of logic for a view.  A good bit of it can be moved
- * to the page handler
- *
- * @uses string $vars['sections'] Array of section_id => Section Display Name
- * @uses string $vars['active_section'] Currently selected section_id
- */
-
-$sections = elgg_extract('sections', $vars, array());
-$active_section = elgg_extract('active_section', $vars, array_shift(array_keys($sections)), false);
-$upload_sections = elgg_extract('upload_sections', $vars, array());
-
-if (!$sections) {
-       $content = elgg_echo('embed:no_sections');
-} else {
-       $content = elgg_view_title(elgg_echo('embed:media'));
-       $content .= elgg_view('embed/tabs', $vars);
-
-       $offset = (int)max(0, get_input('offset', 0));
-       $limit = (int)get_input('limit', 5);
-
-       // find the view to display
-       // @todo make it so you don't have to manually create views for each page
-       $view = "embed/$active_section/content";
-       
-       $section_content = elgg_view($view, $vars);
-
-       // build the items and layout.
-       if ($section_content) {
-               $content .= $section_content;
-       } else {
-               $content .= elgg_echo('embed:no_section_content');
-       }
-}
-
-echo '<div class="embed-wrapper">' . $content . '</div>';
-
-if (isset($js)) {
-       echo '<script type="text/javascript">';
-       echo $js;
-       echo '</script>';
-}
index a64a67d8b337eec89e53867ba12d1dad63918f1b..c6faa450bf84ded51d6090706f9c85fdaadc0130 100644 (file)
@@ -2,7 +2,7 @@
 /**
  * Embeddable content list item view
  *
- * @uses $vars['entity']
+ * @uses $vars['entity'] ElggEntity object
  */
 
 $entity = $vars['entity'];
index e36280e880ec5c6ebc4c93dd7ce0556261e52a82..c13639cff52f4be2df69583e7178e998fd687d79 100644 (file)
@@ -9,9 +9,6 @@
  * @uses $vars['limit']       Number of items per page
  * @uses $vars['count']       Number of items in the complete list
  *
- * @uses $vars['pagination']  Show pagination? (default: true)
- * @uses $vars['position']    Position of the pagination: before, after, or both
- * @uses $vars['full_view']   Show the full view of the items (default: false)
  * @uses $vars['list_class']  Additional CSS class for the <ul> element
  * @uses $vars['item_class']  Additional CSS class for the <li> elements
  */
diff --git a/mod/embed/views/default/embed/tabs.php b/mod/embed/views/default/embed/tabs.php
deleted file mode 100644 (file)
index 3f377fe..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Embed tabs
- *
- * @uses $vars['sections']
- * @uses $vars['upload_sections']
- * @uses $vars['actibe_section']
- */
-
-$sections = elgg_extract('sections', $vars, array());
-$active_section = elgg_extract('active_section', $vars, array_shift(array_keys($sections)));
-$upload_sections = elgg_extract('upload_sections', $vars, array());
-
-$tabs = array();
-foreach ($sections as $section_id => $section_info) {
-       $tab = array(
-               'title' => $section_info['name'],
-               'url' => '#',
-               'url_class' => 'embed-section',
-               'url_id' => $section_id,
-       );
-
-       if ($section_id == $active_section) {
-               $tab['selected'] = TRUE;
-       }
-       $tabs[] = $tab;
-}
-
-// make sure upload is always the last tab
-if ($upload_sections) {
-       $tabs[] = array(
-               'title' => elgg_echo('embed:upload'),
-               'url' => '#',
-               'url_class' => 'embed-section',
-               'url_id' => 'upload',
-               'selected' => ($active_section == 'upload')
-       );
-}
-
-echo elgg_view('navigation/tabs', array('tabs' => $tabs));
diff --git a/mod/embed/views/default/group/default/embed.php b/mod/embed/views/default/group/default/embed.php
deleted file mode 100644 (file)
index bf51f0a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-       if ($vars['entity'] instanceof ElggGroup) {
-               echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';
-       }
-?>
\ No newline at end of file
index 49c277b6975dc3f433ef50145c50a3eec3c39ac8..e60c6b367bbdf689c3d8af924283269b51b5d8ee 100644 (file)
@@ -1,4 +1,3 @@
-//<script>
 elgg.provide('elgg.embed');
 
 elgg.embed.init = function() {
@@ -82,7 +81,7 @@ elgg.embed.submit = function(event) {
 }
 
 /**
- * Loads the next chunk of content within the lightbox
+ * Loads content within the lightbox
  *
  * @param {Object} event
  * @return void
@@ -92,15 +91,4 @@ elgg.embed.loadContent = function(event) {
        event.preventDefault();
 }
 
-/**
- * Loads an embed tab
- *
- * @param {Object} event
- * @return void
- */
-elgg.embed.loadTab = function(event) {
-       $('.embed-wrapper').parent().load($(this).attr('href'));
-       event.preventDefault();
-}
-
 elgg.register_hook_handler('init', 'system', elgg.embed.init);
diff --git a/mod/embed/views/default/object/default/embed.php b/mod/embed/views/default/object/default/embed.php
deleted file mode 100644 (file)
index aca2cee..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-if ($vars['entity'] instanceof ElggObject) {
-       $title = htmlspecialchars($vars['entity']->title, ENT_QUOTES);
-       echo "<a href=\"{$vars['entity']->getURL()}\">$title</a>";
-}
diff --git a/mod/embed/views/default/object/file/embed.php b/mod/embed/views/default/object/file/embed.php
deleted file mode 100644 (file)
index b93c46e..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-       $mime = $vars['entity']->mimetype;
-       
-       if (elgg_view_exists('file/specialcontent/' . $mime)) {
-               $content = elgg_view('file/specialcontent/' . $mime, $vars);
-       } else if (elgg_view_exists("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default")) {
-               $content = elgg_view("file/specialcontent/" . substr($mime,0,strpos($mime,'/')) . "/default", $vars);
-       }
-       
-       if (empty($content) || substr_count(strtolower($content),'<embed') || substr_count(strtolower($content),'<object') || substr_count(strtolower($content),'<script')) {
-               echo elgg_view('object/default/embed',$vars);
-       } else {
-               echo $content;
-       }
-       
-?>
\ No newline at end of file
diff --git a/mod/embed/views/default/object/file/embedlist.php b/mod/embed/views/default/object/file/embedlist.php
deleted file mode 100644 (file)
index 5a3163e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-       $file = $vars['entity'];
-       $friendlytime = elgg_view_friendly_time($vars['entity']->time_created);
-       
-       $info = "<p class='entity-title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
-       $info .= "<p class='elgg-subtitle'>{$friendlytime}";
-       $icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $file->mimetype, 'thumbnail' => $file->thumbnail, 'file_guid' => $file->guid, 'size' => 'small')) . "</a>";
-?>
-<div id="embed_entity_<?php echo $file->guid; ?>">
-       <?php echo elgg_view_image_block($icon, $info); ?>
-</div>
diff --git a/mod/embed/views/default/site/default/embed.php b/mod/embed/views/default/site/default/embed.php
deleted file mode 100644 (file)
index 2e8920a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-       if ($vars['entity'] instanceof ElggSite) {      
-               echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';     
-       }
-?>
\ No newline at end of file
diff --git a/mod/embed/views/default/user/default/embed.php b/mod/embed/views/default/user/default/embed.php
deleted file mode 100644 (file)
index df538c9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-       if ($vars['entity'] instanceof ElggUser) {      
-               echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';     
-       }
-?>
\ No newline at end of file