]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Updated Embed mod to new UI.
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 16 Mar 2010 12:09:44 +0000 (12:09 +0000)
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 16 Mar 2010 12:09:44 +0000 (12:09 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@5415 36083f99-b078-4883-b0ff-0f9b5a30f544

19 files changed:
mod/embed/embed.php
mod/embed/images/button_spacer.gif [deleted file]
mod/embed/images/loading.gif [deleted file]
mod/embed/images/media_modal.png [deleted file]
mod/embed/start.php
mod/embed/views/default/embed/css.php
mod/embed/views/default/embed/js.php
mod/embed/views/default/embed/link.php
mod/embed/views/default/embed/media.php
mod/embed/views/default/embed/pagination.php
mod/embed/views/default/embed/simpletype.php
mod/embed/views/default/embed/tabs.php
mod/embed/views/default/embed/upload.php
mod/embed/views/default/group/default/embed.php
mod/embed/views/default/object/default/embed.php
mod/embed/views/default/object/file/embed.php
mod/embed/views/default/object/file/embedlist.php
mod/embed/views/default/site/default/embed.php
mod/embed/views/default/user/default/embed.php

index 461bbdebb79e45835d5e9df03104ad704190721a..3585474919f3168a8bce829525030f6d29d9c1bf 100644 (file)
@@ -1,38 +1,37 @@
 <?php
+// This page can only be run from within the Elgg framework
+       if (!is_callable('elgg_view')) exit;
+       
+// Get the name of the form field we need to inject into
+       $internalname = get_input('internalname');
+       
+       if (!isloggedin()) exit;
+       
+       global $SESSION;
+       
+       $offset = (int) get_input('offset',0);
+       $simpletype = get_input('simpletype');
+       $entity_types = array('object' => array('file'));
 
-       // This page can only be run from within the Elgg framework
-               if (!is_callable('elgg_view')) exit;
-               
-       // Get the name of the form field we need to inject into
-               $internalname = get_input('internalname');
-               
-               if (!isloggedin()) exit;
-               
-               global $SESSION;
-               
-               $offset = (int) get_input('offset',0);
-               $simpletype = get_input('simpletype');
-               $entity_types = array('object' => array('file'));
-
-               if (empty($simpletype)) {
-                       $count = elgg_get_entities(array('type' => 'object', 'subtype' => 'file', 'owner_guid' => $SESSION['user']->guid, 'count' => TRUE));
-                       $entities = elgg_get_entities(array('type' => 'object', 'subtype' => 'file', 'owner_guid' => $SESSION['user']->guid, 'limit' => 6, 'offset' => $offset));
-               } else {
-                       $count = elgg_get_entities_from_metadata(array('metadata_name' => 'simpletype', 'metadata_value' => $simpletype, 'types' => 'object', 'subtypes' => 'file', 'owner_guid' => $SESSION['user']->guid, 'limit' => 6, 'offset' => $offset, 'count' => TRUE));
-                       $entities = elgg_get_entities_from_metadata(array('metadata_name' => 'simpletype', 'metadata_value' => $simpletype, 'types' => 'object', 'subtypes' => 'file', 'owner_guid' => $SESSION['user']->guid, 'limit' => 6, 'offset' => $offset));
-               }
-               
-               $types = get_tags(0,10,'simpletype','object','file',$SESSION['user']->guid);
-               
-       // Echo the embed view
-               echo elgg_view('embed/media', array(
-                                                       'entities' => $entities,
-                                                       'internalname' => $internalname,
-                                                       'offset' => $offset,
-                                                       'count' => $count,
-                                                       'simpletype' => $simpletype,
-                                                       'limit' => 6,
-                                                       'simpletypes' => $types,
-                                          ));
+       if (empty($simpletype)) {
+               $count = elgg_get_entities(array('type' => 'object', 'subtype' => 'file', 'owner_guid' => $SESSION['user']->guid, 'count' => TRUE));
+               $entities = elgg_get_entities(array('type' => 'object', 'subtype' => 'file', 'owner_guid' => $SESSION['user']->guid, 'limit' => 6, 'offset' => $offset));
+       } else {
+               $count = elgg_get_entities_from_metadata(array('metadata_name' => 'simpletype', 'metadata_value' => $simpletype, 'types' => 'object', 'subtypes' => 'file', 'owner_guid' => $SESSION['user']->guid, 'limit' => 6, 'offset' => $offset, 'count' => TRUE));
+               $entities = elgg_get_entities_from_metadata(array('metadata_name' => 'simpletype', 'metadata_value' => $simpletype, 'types' => 'object', 'subtypes' => 'file', 'owner_guid' => $SESSION['user']->guid, 'limit' => 6, 'offset' => $offset));
+       }
+       
+       $types = get_tags(0,10,'simpletype','object','file',$SESSION['user']->guid);
+       
+// Echo the embed view
+       echo elgg_view('embed/media', array(
+                                               'entities' => $entities,
+                                               'internalname' => $internalname,
+                                               'offset' => $offset,
+                                               'count' => $count,
+                                               'simpletype' => $simpletype,
+                                               'limit' => 6,
+                                               'simpletypes' => $types,
+                                  ));
 
 ?>
\ No newline at end of file
diff --git a/mod/embed/images/button_spacer.gif b/mod/embed/images/button_spacer.gif
deleted file mode 100644 (file)
index 5bfd67a..0000000
Binary files a/mod/embed/images/button_spacer.gif and /dev/null differ
diff --git a/mod/embed/images/loading.gif b/mod/embed/images/loading.gif
deleted file mode 100644 (file)
index 5a9af96..0000000
Binary files a/mod/embed/images/loading.gif and /dev/null differ
diff --git a/mod/embed/images/media_modal.png b/mod/embed/images/media_modal.png
deleted file mode 100644 (file)
index 9d20690..0000000
Binary files a/mod/embed/images/media_modal.png and /dev/null differ
index b14767381bfb6dec3528f3dad02a1a3b805f45a8..d6bdcc0c9039ef79572c09866321aba681598d3e 100644 (file)
@@ -1,50 +1,49 @@
 <?php
+/**
+ * Elgg media embed plugin
+ * 
+ * @package ElggEmbed
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 
-       /**
-        * Elgg media embed plugin
-        * 
-        * @package ElggEmbed
-        * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-        * @author Curverider Ltd <info@elgg.com>
-        * @copyright Curverider Ltd 2008-2010
-        * @link http://elgg.com/
-        */
-
-       /**
-        * Init function
-        *
-        */
-               function embed_init() {
-                       
-                       // Extend useful views with stuff we need for our embed modal
-                               elgg_extend_view('css','embed/css');
-                               elgg_extend_view('js/initialise_elgg','embed/js');
-                               elgg_extend_view('metatags','embed/metatags');
-                               elgg_extend_view('input/longtext','embed/link',10);
-                               
-                       // Page handler for the modal media embed
-                               register_page_handler('embed','embed_page_handler');
-                       
-               }
+/**
+ * Init function
+ *
+ */
+       function embed_init() {
                
-       /**
-        * Runs the 'embed' script
-        *
-        */
-               function embed_page_handler($page) {
-                       
-                       switch($page[0]) {
-                               case 'upload':          require_once(dirname(__FILE__) . '/upload.php');
-                                                                       exit;
-                                                                       break;
-                               default:                        require_once(dirname(__FILE__) . '/embed.php');
-                                                                       exit;
-                                                                       break;                  
-                       }
+               // Extend useful views with stuff we need for our embed modal
+                       elgg_extend_view('css','embed/css');
+                       elgg_extend_view('js/initialise_elgg','embed/js');
+                       elgg_extend_view('metatags','embed/metatags');
+                       elgg_extend_view('input/longtext','embed/link',10);
                        
+               // Page handler for the modal media embed
+                       register_page_handler('embed','embed_page_handler');
+               
+       }
+       
+/**
+ * Runs the 'embed' script
+ *
+ */
+       function embed_page_handler($page) {
+               
+               switch($page[0]) {
+                       case 'upload':          require_once(dirname(__FILE__) . '/upload.php');
+                                                               exit;
+                                                               break;
+                       default:                        require_once(dirname(__FILE__) . '/embed.php');
+                                                               exit;
+                                                               break;                  
                }
+               
+       }
 
-       // Register the init action
-               register_elgg_event_handler('init','system','embed_init',10);
+// Register the init action
+       register_elgg_event_handler('init','system','embed_init',10);
 
 ?>
index 31d474a612406c1fe4c31bf7cb2246635550410e..1b4f3ca80f10e9b4e42a47d3fd8e90eb194dc0e7 100644 (file)
@@ -1,15 +1,13 @@
 <?php
-
-       /**
-        * Elgg embed CSS - standard across all themes
-        * 
-        * @package embed
-        * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-        * @author Curverider <info@elgg.com>
-        * @copyright Curverider Ltd 2008-2010
-        * @link http://elgg.org/
-        */
-
+/**
+ * Elgg embed CSS - standard across all themes
+ * 
+ * @package embed
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
 ?>
 
 #facebox {
@@ -24,7 +22,7 @@
 }
 #facebox .body {
        padding: 10px;
-       background: white;
+       background-color: white;
        width: 730px;
        -webkit-border-radius: 12px; 
        -moz-border-radius: 12px;
 #facebox .footer img.close_image:hover {
        background: url(<?php echo $vars['url']; ?>mod/embed/images/close_button.gif) no-repeat left -31px;
 }
-#facebox .footer a {
-       -moz-outline: none;
-       outline: none;
-}
 #facebox_overlay {
        position: fixed;
        top: 0px;
        background-color: #000000;
        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');
 }
 
+/* entity listing overrides */
+#media_upload,
+#media_embed {
+       margin:0 5px 10px 5px;
+       padding:10px;
+       border:2px solid #dedede;
+       -webkit-border-radius: 8px;
+       -moz-border-radius: 8px;
+       background: #dedede;
+}
+#media_embed .entity_listing {
+       margin:0;
+       padding:0;
+       background-color: white;
+}
+#media_embed .entity_listing_info {
+       width:610px;
+}
+#media_upload .input_textarea {
+       height:100px;
+       width:682px;
+}
+#media_embed .embed_instructions {
+       margin:10px 0 5px 0;
+}
+a.embed_media {
+       margin:0;
+       float:right;
+       display:block;
+       text-align: right;
+       font-weight: normal;
+}
+label a.embed_media {
+       font-size:0.8em;
+}
+
 
-/* EMBED MEDIA TABS */
+/* modal tabs */
 #embed_media_tabs {
        margin:10px 0 0 10px;
        padding:0;
 }
 #embed_media_tabs ul li a {
        font-weight: bold;
-       font-size:1.35em;
+       font-size:1.2em;
        text-align: center;
        text-decoration: none;
        color:#b6b6b6;
        background: white;
        display: block;
-       padding: 0 10px 0 10px;
+       padding: 3px 10px 0 10px;
        margin:0 10px 0 10px;
-       height:25px;
+       height:20px;
        width:auto;
        border-top:2px solid #dedede;
        border-left:2px solid #dedede;
        -webkit-border-top-left-radius: 8px;
        -webkit-border-top-right-radius: 8px;
 }
-/* IE6 fix */
-* html #embed_media_tabs ul li a { display: inline; }
-
 #embed_media_tabs ul li a:hover {
        background:#b6b6b6;
        color:white;
        background: #dedede;
        color:#666666;
        position: relative;
-       /* top: 2px; - only needed if selected tab needs to sit over a border */
-}
-
-#mediaUpload,
-#mediaEmbed {
-       margin:0 5px 10px 5px;
-       padding:10px;
-       border:2px solid #dedede;
-       -webkit-border-radius: 8px;
-       -moz-border-radius: 8px;
-       background: #dedede;
-}
-#mediaEmbed .search_listing {
-       margin:0 0 5px 0;
-       background: white;
 }
+/* IE6 fix */
+* html #embed_media_tabs ul li a { display: inline; }
 
-h1.mediaModalTitle {
-       /* color:#0054A7; */
-       font-size:1.35em;
-       line-height:1.2em;
-       margin:0 0 0 8px;
-       padding:5px;
-}
 
-#mediaEmbed .pagination,
-#mediaUpload .pagination {
+/* Pagination (override core elgg css defaults) */
+#media_embed .pagination,
+#media_upload .pagination {
        float:right;
        padding:5px;
-       background:white;
+       background-color:white;
        -webkit-border-radius: 5px;
        -moz-border-radius: 5px;        
 }
-#mediaUpload label {
-       font-size:120%;
-}
-#mediaEmbed p.embedInstructions {
-       margin:10px 0 5px 0;
-}
-a.embed_media {
-       margin:0;
-       float:right;
-       display:block;
-       text-align: right;
-       font-size:1.0em;
-       font-weight: normal;
-}
-label a.embed_media {
-       font-size:0.8em;
-}
-
-
-
-
-/* ***************************************
-       PAGINATION
-*************************************** */
-#mediaEmbed .pagination .pagination_number {
+#media_embed .pagination .pagination_number {
        border:1px solid #999999; 
        color:#666666;
 }
-#mediaEmbed .pagination .pagination_number:hover {
-       background:#aaaaaa; 
+#media_embed .pagination .pagination_number:hover {
+       background-color:#aaaaaa; 
        color:black;
 }
-
-#mediaEmbed .pagination .pagination_previous,
-#mediaEmbed .pagination .pagination_next {
+#media_embed .pagination .pagination_previous,
+#media_embed .pagination .pagination_next {
        border:1px solid #999999; 
        color:#666666;
 }
-#mediaEmbed .pagination .pagination_previous:hover,
-#mediaEmbed .pagination .pagination_next:hover {
-       background:#aaaaaa; 
+#media_embed .pagination .pagination_previous:hover,
+#media_embed .pagination .pagination_next:hover {
+       background-color:#aaaaaa; 
        color:black;
 }
-#mediaEmbed .pagination .pagination_currentpage {
-       background:#666666; 
+#media_embed .pagination .pagination_currentpage {
+       background-color:#666666; 
        border:1px solid #666666; 
        color:white;
-}
-
-
-
-
-
-
-
-
-
-
+}
\ No newline at end of file
index fa809ce23d74c4df6e6f96e8145ca5a5087c6408..71120e68f20c42e048a508b9faa106a794917d5a 100644 (file)
     settings: {
       opacity      : 0.7,
       overlay      : true,
-      loadingImage : '<?php echo $vars['url']; ?>mod/embed/images/loading.gif',
-      closeImage   : '<?php echo $vars['url']; ?>mod/embed/images/button_spacer.gif',
+      loadingImage : '<?php echo $vars['url']; ?>_graphics/ajax_loader_bw.gif',
+      closeImage   : '<?php echo $vars['url']; ?>_graphics/spacer.gif',
       imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
       faceboxHtml  : '\
-    <div id="facebox" style="display:none;"> \
+    <div id="facebox" class="hidden"> \
       <div class="popup"> \
              <div class="body"> \
                      <div class="footer"> \
                          <a href="#" class="close"> \
-                           <img src="<?php echo $vars['url']; ?>mod/embed/images/button_spacer.gif" title="close" class="close_image" width="22" height="22" border="0" /> \
+                           <img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" title="close" class="close_image" width="22" height="22" border="0" /> \
                          </a> \
                        </div> \
                        <div class="content"> \
            $('#facebox .body').children().fadeIn('slow');
         $('#facebox').css('left', $(window).width() / 2 - ($('#facebox').width() / 2));
         $(document).trigger('reveal.facebox').trigger('afterReveal.facebox');
-        }, 1000);
+        }, 100);
       
       //$('#facebox .loading').remove()
       //$('#facebox .body').children().fadeIn('slow')
index f8db0bd85998a79f5d7639404cd6c0ceafba0357..0dd77ac9948064eef25d50a22e96480b00f50364 100644 (file)
@@ -1 +1 @@
-<a class="embed_media" href="<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a><br />
\ No newline at end of file
+<a class="embed_media small link" href="<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a><br />
\ No newline at end of file
index 48bf65fdf2fb252feef32add2d56267aa6b501ce..25e63ce7d0646eae3d6337111f5481c890e55fd0 100644 (file)
@@ -1,9 +1,9 @@
-<h1 class="mediaModalTitle">Embed / Upload Media</h1>
+<h2 class="media_modal_title">Embed / Upload Media</h2>
 <?php
 
        echo elgg_view('embed/tabs',array('tab' => 'media', 'internalname' => $vars['internalname']));
 ?>
-       <div id='mediaEmbed'>
+       <div id="media_embed">
 <?php
        echo elgg_view('embed/pagination',array(
                                                                                                'offset' => $vars['offset'],
@@ -22,7 +22,7 @@
        $entities = $vars['entities'];
        if (is_array($entities) && !empty($entities)) {
                
-               echo "<p class=\"embedInstructions\">" . elgg_echo('embed:instructions') . "</p>";
+               echo "<p class='embed_instructions'>" . elgg_echo('embed:instructions') . "</p>";
                
                foreach($entities as $entity) {
                        if ($entity instanceof ElggEntity) {
index d087fc12c870c5381c459a20bc77c75ecebc6943..b5a741fcdf15eab3917fa6ddf469ca2d717004bb 100644 (file)
@@ -92,7 +92,7 @@
 
                        if (($i - $prev) > 1) {
 
-                               echo "<span class=\"pagination_more\">...</span>";
+                               echo "<span class='pagination_more'>...</span>";
 
                        }
 
                        if ($curoffset != $offset) {
                                echo " <a onclick=\"javascript:$('.popup .content').load('{$counturl}'); return false\" href=\"#\" class=\"pagination_number\">{$i}</a> ";
                        } else {
-                               echo "<span class=\"pagination_currentpage\"> {$i} </span>";
+                               echo "<span class='pagination_currentpage'> {$i} </span>";
                        }
                        $prev = $i;
 
        }
 
 ?>
-<br class="clearfloat" />
 </div>
 <?php
        } // end of pagination check if statement
index f92678f52269c3784a59189088275fb6177fe8f0..790284fd8ecd49eee2893fb28f42161ad43eddef 100644 (file)
@@ -1,39 +1,35 @@
-       <select name="simpletype" id="embed_simpletype_select">
-       
+<select name="simpletype" id="embed_simpletype_select">
 <?php
 
-               $all = new stdClass;
-               $all->tag = "all";
-               $vars['simpletypes'][] = $all;
-               $vars['simpletypes'] = array_reverse($vars['simpletypes']);
+       $all = new stdClass;
+       $all->tag = "all";
+       $vars['simpletypes'][] = $all;
+       $vars['simpletypes'] = array_reverse($vars['simpletypes']);
 
-               if (isset($vars['simpletypes']) && is_array($vars['simpletypes']))
-                       foreach($vars['simpletypes'] as $type) {
-                               
-                               if ($vars['simpletype'] == $type->tag || (empty($vars['simpletype']) && $type->tag == 'all')) {
-                                       $selected = 'selected = "selected"';
-                               } else $selected = '';
-                               $tag = $type->tag;
-                               if ($tag != "all") {
-                                       $label = elgg_echo("file:type:" . $tag);
-                               } else {
-                                       $tag = '';
-                                       $label = elgg_echo('all');
-                               }
-                               
-?>
-                               <option <?php echo $selected; ?> value="<?php echo $tag; ?>"><?php echo $label; ?></option>
-<?php
-                               
+       if (isset($vars['simpletypes']) && is_array($vars['simpletypes']))
+               foreach($vars['simpletypes'] as $type) {
+                       
+                       if ($vars['simpletype'] == $type->tag || (empty($vars['simpletype']) && $type->tag == 'all')) {
+                               $selected = 'selected = "selected"';
+                       } else $selected = '';
+                       $tag = $type->tag;
+                       if ($tag != "all") {
+                               $label = elgg_echo("file:type:" . $tag);
+                       } else {
+                               $tag = '';
+                               $label = elgg_echo('all');
                        }
-
+                       
+?>
+                       <option <?php echo $selected; ?> value="<?php echo $tag; ?>"><?php echo $label; ?></option>
+<?php          
+               }
 ?>
-       
-       </select>
-       <script type="text/javascript">
-               $('#embed_simpletype_select').change(function(){
-                       var simpletype = $('#embed_simpletype_select').val();
-                       var url = '<?php echo $vars['url']; ?>pg/embed/media?simpletype=' + simpletype + '&internalname=<?php echo $vars['internalname']; ?>';
-                       $('.popup .content').load(url);
-               });
-       </script>
+</select>
+<script type="text/javascript">
+       $('#embed_simpletype_select').change(function(){
+               var simpletype = $('#embed_simpletype_select').val();
+               var url = '<?php echo $vars['url']; ?>pg/embed/media?simpletype=' + simpletype + '&internalname=<?php echo $vars['internalname']; ?>';
+               $('.popup .content').load(url);
+       });
+</script>
index 8b2f5bde4ce8f09e4af831e925dac4d679f080a8..a83bc9b558039dd609e549d1e8d9fd8c1af00d5e 100644 (file)
@@ -10,7 +10,7 @@
 
 ?>
 
-<div id="embed_media_tabs">
+<div id="embed_media_tabs" class="clearfloat">
        <ul>
                <li>
                        <a href="#" <?php echo $embedselected; ?> onclick="javascript:$('.popup .content').load('<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>'); return false"><?php echo elgg_echo('embed:media'); ?></a>
@@ -19,5 +19,4 @@
                        <a href="#" <?php echo $uploadselected; ?> onclick="javascript:$('.popup .content').load('<?php echo $vars['url'] . 'pg/embed/upload'; ?>?internalname=<?php echo $vars['internalname']; ?>'); return false"><?php echo elgg_echo('upload:media'); ?></a>
                </li>
        </ul>
-</div>
-<div class="clearfloat"></div>
\ No newline at end of file
+</div>
\ No newline at end of file
index fbdcbfd8c335e0b5161b92073a02757067a68559..d995b4b2b476ab5be6b6cab41a328b16244fc421 100644 (file)
@@ -1,88 +1,85 @@
-<h1 class="mediaModalTitle">Embed / Upload Media</h1>
+<h2 class="media_modal_title">Embed / Upload Media</h2>
 <?php
 
-       echo elgg_view('embed/tabs',array('tab' => 'upload', 'internalname'=>get_input('internalname')));
+echo elgg_view('embed/tabs',array('tab' => 'upload', 'internalname'=>get_input('internalname')));
 
-       if (!elgg_view_exists('file/upload')) {
-               echo "<p>" . elgg_echo('embed:file:required') . "</p>";
-       } else {
-               $action = 'file/upload';
-               
+if (!elgg_view_exists('file/upload')) {
+       echo "<p>" . elgg_echo('embed:file:required') . "</p>";
+} else {
+       $action = 'file/upload';
+       
 ?>
-       <form id="mediaUpload" action="<?php echo $vars['url']; ?>action/file/upload" method="post" enctype="multipart/form-data">
-               <p>
-                       <label for="upload"><?php echo elgg_echo("file:file"); ?><br />
+<form id="media_upload" action="<?php echo $vars['url']; ?>action/file/upload" method="post" enctype="multipart/form-data">
+       <p>
+               <label for="upload"><?php echo elgg_echo("file:file"); ?><br />
+       <?php
+               echo elgg_view('input/securitytoken');
+               echo elgg_view("input/file",array('internalname' => 'upload', 'js' => 'id="upload"'));
+               
+       ?>
+       </label></p>
+       <p>
+               <label><?php echo elgg_echo("title"); ?><br />
                <?php
-                       echo elgg_view('input/securitytoken');
-                       echo elgg_view("input/file",array('internalname' => 'upload', 'js' => 'id="upload"'));
-                       
-               ?>
-               </label></p>
-               <p>
-                       <label><?php echo elgg_echo("title"); ?><br />
-                       <?php
 
-                               echo elgg_view("input/text", array(
-                                                                       "internalname" => "title",
-                                                                       "value" => $title,
-                                                                                                       ));
-                       
-                       ?>
-                       </label>
-               </p>
-               <p>
-               <label for="filedescription"><?php echo elgg_echo("description"); ?><br />
-               <textarea class="input_textarea" name="description" id="filedescription"></textarea>
-               </label></p>
+                       echo elgg_view("input/text", array(
+                                                               "internalname" => "title",
+                                                               "value" => $title,
+                                                                                               ));
                
-               <p>
-                       <label><?php echo elgg_echo("tags"); ?><br />
-                       <?php
-                               echo elgg_view("input/tags", array(
-                                                                       "internalname" => "tags",
-                                                                       "value" => $tags,
-                                                                                                       ));
-       
-                       ?>
-                       </label>
-               </p>
-               <p>
-                       <label>
-                               <?php echo elgg_echo('access'); ?><br />
-                               <?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => ACCESS_DEFAULT)); ?>
-                       </label>
-               </p>
+               ?>
+               </label>
+       </p>
+       <p>
+       <label for="filedescription"><?php echo elgg_echo("description"); ?><br />
+       <textarea class="input_textarea" name="description" id="filedescription"></textarea>
+       </label></p>
        
-               <p>
-                       <?php
+       <p>
+               <label><?php echo elgg_echo("tags"); ?><br />
+               <?php
+                       echo elgg_view("input/tags", array(
+                                                               "internalname" => "tags",
+                                                               "value" => $tags,
+                                                                                               ));
 
-                               if (isset($vars['container_guid']))
-                                       echo "<input type=\"hidden\" name=\"container_guid\" value=\"{$vars['container_guid']}\" />";
-                               if (isset($vars['entity']))
-                                       echo "<input type=\"hidden\" name=\"file_guid\" value=\"{$vars['entity']->getGUID()}\" />";
-                       
-                       ?>
-                       <input type="submit" value="<?php echo elgg_echo("save"); ?>" />
-               </p>
-       </form>
-       <script type="text/javascript"> 
-        // wait for the DOM to be loaded 
-        //$(document).ready(function() { 
-            // bind 'myForm' and provide a simple callback function 
-            $('#mediaUpload').submit(function() { 
-                   var options = {  
-                                   success:    function() { 
-                                       $('.popup .content').load('<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>'); 
-                                   } 
-                               }; 
-               $(this).ajaxSubmit(options);
-                return false; 
-            }); 
-        //}); 
-    </script> 
+               ?>
+               </label>
+       </p>
+       <p>
+               <label>
+                       <?php echo elgg_echo('access'); ?><br />
+                       <?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => ACCESS_DEFAULT)); ?>
+               </label>
+       </p>
 
-<?php
+       <p>
+               <?php
+
+                       if (isset($vars['container_guid']))
+                               echo "<input type=\"hidden\" name=\"container_guid\" value=\"{$vars['container_guid']}\" />";
+                       if (isset($vars['entity']))
+                               echo "<input type=\"hidden\" name=\"file_guid\" value=\"{$vars['entity']->getGUID()}\" />";
                
-       }
+               ?>
+               <input type="submit" value="<?php echo elgg_echo("save"); ?>" />
+       </p>
+</form>
+<script type="text/javascript"> 
+        // bind 'myForm' and provide a simple callback function 
+        $('#media_upload').submit(function() { 
+            var options = {  
+                           success:    function() { 
+                               $('.popup .content').load('<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>'); 
+                           } 
+                       }; 
+               $(this).ajaxSubmit(options);
+            return false; 
+        }); 
+</script> 
+
+<?php
        
+}
+
 ?>
index c5bf905a072a9dd5a31621f966b716ab8d0114a7..34a0d0c61affea9759489402a0b8c4e817e74887 100644 (file)
@@ -1,9 +1,5 @@
 <?php
-
        if ($vars['entity'] instanceof ElggGroup) {
-               
                echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->title . '</a>';
-               
        }
-
 ?>
\ No newline at end of file
index c97dbd48a54108d325d7221366f80a136e7cb4b6..6f698a157acb01345c9ff096e7e92169f2fdb03f 100644 (file)
@@ -1,9 +1,5 @@
 <?php
-
        if ($vars['entity'] instanceof ElggObject) {
-               
                echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->title . '</a>';
-               
        }
-
 ?>
\ No newline at end of file
index 01f3904ac99ca73506a04e801b7ad3d6eb2010ce..b93c46e5e44a98071f5f5f80632dc10689a6a6d5 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-
        $mime = $vars['entity']->mimetype;
        
        if (elgg_view_exists('file/specialcontent/' . $mime)) {
index 71e84f265925b4de8257bce08b5c93c94f24bd79..345e69b4bd29f7094b1d013479d940127ed92757 100644 (file)
@@ -1,19 +1,17 @@
 <?php
-
        $file = $vars['entity'];
        $friendlytime = friendly_time($vars['entity']->time_created);
        
-       $info = "<p> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
-       $info .= "<p class=\"owner_timestamp\">{$friendlytime}";        
+       $info = "<p class='entity_title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
+       $info .= "<p class='entity_subtext'>{$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="embedFile<?php echo $file->guid; ?>">
-       <div class="search_listing">
-               <div class="search_listing_icon">
+<div id="embed_entity_<?php echo $file->guid; ?>">
+       <div class="entity_listing clearfloat">
+               <div class="entity_listing_icon">
                        <?php echo $icon; ?>
                </div>
-               <div class="search_listing_info">
+               <div class="entity_listing_info">
                        <?php echo $info; ?>
                </div>
        </div>
index 2d0c52214cff01fa904c8a776e02cf8dbd19038f..2e8920a9a018fc3c8fa48e21c633852c25e87cd3 100644 (file)
@@ -1,9 +1,5 @@
 <?php
-
-       if ($vars['entity'] instanceof ElggSite) {
-               
-               echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';
-               
+       if ($vars['entity'] instanceof ElggSite) {      
+               echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';     
        }
-
 ?>
\ No newline at end of file
index 1c3dae072c8564988168a0defa6497fff2fb93e7..df538c94cefd1f574ba55043c57cd3f4758b6882 100644 (file)
@@ -1,9 +1,5 @@
 <?php
-
-       if ($vars['entity'] instanceof ElggUser) {
-               
-               echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';
-               
+       if ($vars['entity'] instanceof ElggUser) {      
+               echo '<a href="'. $vars['entity']->getURL() .'">' . $vars['entity']->name . '</a>';     
        }
-
 ?>
\ No newline at end of file