]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1c3b6bd)
improved .elgg-gallery and added .elgg-photo
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 18 Feb 2011 02:22:04 +0000 (02:22 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 18 Feb 2011 02:22:04 +0000 (02:22 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8281 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/file/views/default/file/css.php patch | blob | history
mod/file/views/default/file/specialcontent/image/default.php patch | blob | history
mod/file/views/default/icon/object/file.php [new file with mode: 0644] patch | blob
views/default/css/elements/chrome.php patch | blob | history
views/default/css/elements/layout_objects.php patch | blob | history

diff --git a/mod/file/views/default/file/css.php b/mod/file/views/default/file/css.php
index 53fa94e460b6dffd74879b71b73e1720181ca536..5476ed7e257ce643d7bb5c04dc0ed6fe17a3ec3f 100644 (file)
--- a/mod/file/views/default/file/css.php
+++ b/mod/file/views/default/file/css.php
@@ -5,25 +5,11 @@
  * @package ElggFile
  */
 ?>
-.file-image {
+.file-photo {
        text-align: center;
-}
-.file-image img {
-       padding: 10px;
-       -webkit-border-radius: 6px;
-       -moz-border-radius: 6px;
-       background: #333333;
+       margin-bottom: 15px;
 }
 .file-gallery-item {
-       float: left;
        text-align: center;
        width: 165px;
-       margin: 10px 10px 0 0;
-       padding: 5px;
-       background-color: #eeeeee;
-       -webkit-border-radius: 6px;
-       -moz-border-radius: 6px;
-}
-.file-gallery-item img {
-       margin: 5px 0;
 }
diff --git a/mod/file/views/default/file/specialcontent/image/default.php b/mod/file/views/default/file/specialcontent/image/default.php
index a55b97eb5c78650307c06e8f3b0f3bd83cbd8743..91ec11064a824cc717f4dcd13010ca699651bec3 100644 (file)
--- a/mod/file/views/default/file/specialcontent/image/default.php
+++ b/mod/file/views/default/file/specialcontent/image/default.php
@@ -3,6 +3,13 @@
  * Display an image
  */
 
+$image_url = elgg_get_site_url() . "mod/file/thumbnail.php?file_guid={$vars['entity']->getGUID()}&size=large";
+$download_url = elgg_get_site_url() . "mod/file/download.php?file_guid={$vars['entity']->getGUID()}";
+
 if ($vars['full'] && $smallthumb = $vars['entity']->smallthumb) {
-       echo "<p class=\"file-image\"><a href=\"".elgg_get_site_url()."mod/file/download.php?file_guid={$vars['entity']->getGUID()}\"><img src=\"".elgg_get_site_url()."mod/file/thumbnail.php?file_guid={$vars['entity']->getGUID()}&size=large\" /></a></p>";
+       echo <<<HTML
+               <div class="file-photo">
+                       <a href="$download_url"><img class="elgg-photo" src="$image_url" /></a>
+               </div>
+HTML;
 }
diff --git a/mod/file/views/default/icon/object/file.php b/mod/file/views/default/icon/object/file.php
new file mode 100644 (file)
index 0000000..249dd9c
--- /dev/null
+++ b/mod/file/views/default/icon/object/file.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * File icon view
+ *
+ * @uses $vars['entity'] The entity the icon represents - uses getIconURL() method
+ * @uses $vars['size']   topbar, tiny, small, medium (default), large, master
+ * @uses $vars['href']   Optional override for link
+ */
+
+$entity = $vars['entity'];
+
+$sizes = array('small', 'medium', 'large', 'tiny', 'master', 'topbar');
+// Get size
+if (!in_array($vars['size'], $sizes)) {
+       $vars['size'] = "medium";
+}
+
+$title = $entity->title;
+
+$url = $entity->getURL();
+if (isset($vars['href'])) {
+       $url = $vars['href'];
+}
+
+$class = '';
+if ($entity->thumbnail) {
+       $class = 'class="elgg-photo"';
+}
+
+$img_src = $entity->getIconURL($vars['size']);
+$img = "<img $class src=\"$img_src\" alt=\"$title\" />";
+
+if ($url) {
+       echo elgg_view('output/url', array(
+               'href' => $url,
+               'text' => $img,
+       ));
+} else {
+       echo $img;
+}
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
index 4ed8dcf2d121c800bb7394767ec1814cdad8b5a1..a9b82d41d47c66c97c6147957b2f9c56ef7cdba4 100644 (file)
--- a/views/default/css/elements/chrome.php
+++ b/views/default/css/elements/chrome.php
@@ -122,3 +122,9 @@ h2 {
        line-height: 1.2em;
        font-style: italic;
 }
+
+.elgg-photo {
+       border: 1px solid #ccc;
+       padding: 3px;
+       background-color: white;
+}
diff --git a/views/default/css/elements/layout_objects.php b/views/default/css/elements/layout_objects.php
index 50b7cf767ec0cefe42c59bf883fb148bb6368d66..cc733ea069aeedacafe5dd226ce485ee4ae0121e 100644 (file)
--- a/views/default/css/elements/layout_objects.php
+++ b/views/default/css/elements/layout_objects.php
@@ -90,6 +90,11 @@
 *************************************** */
 .elgg-gallery {
        border: none;
+       margin-right: auto;
+       margin-left: auto;
+}
+.elgg-gallery td {
+       padding: 5px;
 }
 
 /* ***************************************
Social Networking Engine