From 4d80bc33b8924038bd1ca57d548828afe661bb42 Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 2 Dec 2010 03:10:57 +0000 Subject: Refs #2700 replaced most underscores with hyphens - there may be broken display code due to extent of this change git-svn-id: http://code.elgg.org/elgg/trunk@7493 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/embed/views/default/embed/css.php | 48 +++++++++++------------ mod/embed/views/default/embed/embed.php | 6 +-- mod/embed/views/default/embed/item/list.php | 4 +- mod/embed/views/default/embed/js.php | 2 +- mod/embed/views/default/object/file/embedlist.php | 10 ++--- 5 files changed, 35 insertions(+), 35 deletions(-) (limited to 'mod/embed') diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php index 559cd456d..e87584205 100644 --- a/mod/embed/views/default/embed/css.php +++ b/mod/embed/views/default/embed/css.php @@ -79,37 +79,37 @@ } /* entity listings */ -.embed_data .entity_listing_icon img { +.embed_data .entity-listing-icon img { cursor: pointer; } -.embed_data .entity_listing { +.embed_data .entity-listing { border-bottom:none; } .embed_data:last-child { border-bottom:1px dotted #CCCCCC; } -.embed_modal_videolist .entity_listing_icon img { +.embed_modal_videolist .entity-listing-icon img { width:75px; height:auto; } -.embed_modal_document .embed_data .entity_listing_info { +.embed_modal_document .embed_data .entity-listing-info { margin-top:0; margin-left:7px; } -.embed_modal_tidypics .embed_data .entity_listing_info { +.embed_modal_tidypics .embed_data .entity-listing-info { margin-top:11px; } -.embed_modal_file .embed_data .entity_listing_info { +.embed_modal_file .embed_data .entity-listing-info { margin-top:0px; margin-left:9px; } -.embed_data .entity_listing_info { +.embed_data .entity-listing-info { width:auto; margin-top:15px; margin-left:15px; float:left; } -.embed_data .entity_listing { +.embed_data .entity-listing { cursor:pointer; } @@ -139,10 +139,10 @@ #facebox .content p { color:#333333; } -#facebox .content p.entity_title { +#facebox .content p.entity-title { color:#666666; } -#facebox .content .entity_listing:hover { +#facebox .content .entity-listing:hover { background-color: #eeeeee; } #facebox .content label { @@ -153,19 +153,19 @@ /* *************************************** ELGG TABBED PAGE NAVIGATION *************************************** */ -#facebox .body .elgg_horizontal_tabbed_nav { +#facebox .body .elgg-horizontal-tabbed-nav { margin-bottom:5px; padding: 0; border-bottom: 2px solid #cccccc; display:table; width:100%; } -#facebox .body .elgg_horizontal_tabbed_nav ul { +#facebox .body .elgg-horizontal-tabbed-nav ul { list-style: none; padding: 0; margin: 0; } -#facebox .body .elgg_horizontal_tabbed_nav li { +#facebox .body .elgg-horizontal-tabbed-nav li { float: left; border: 2px solid #cccccc; border-bottom-width: 0; @@ -176,7 +176,7 @@ -webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px; } -#facebox .body .elgg_horizontal_tabbed_nav a { +#facebox .body .elgg-horizontal-tabbed-nav a { text-decoration: none; display: block; padding:3px 10px 0 10px; @@ -184,15 +184,15 @@ height:21px; color:#999999; } -#facebox .body .elgg_horizontal_tabbed_nav a:hover { +#facebox .body .elgg-horizontal-tabbed-nav a:hover { background: #dedede; color:#666666; } -#facebox .body .elgg_horizontal_tabbed_nav .selected { +#facebox .body .elgg-horizontal-tabbed-nav .selected { border-color: #cccccc; background: white; } -#facebox .body .elgg_horizontal_tabbed_nav .selected a { +#facebox .body .elgg-horizontal-tabbed-nav .selected a { position: relative; top: 2px; background: white; @@ -204,25 +204,25 @@ #facebox .body .pagination { float:right; } -#facebox .body .pagination .pagination_number { +#facebox .body .pagination .pagination-number { border:1px solid #999999; color:#666666; } -#facebox .body .pagination .pagination_number:hover { +#facebox .body .pagination .pagination-number:hover { background-color:#aaaaaa; color:black; } -#facebox .body .pagination .pagination_previous, -#facebox .body .pagination .pagination_next { +#facebox .body .pagination .pagination-previous, +#facebox .body .pagination .pagination-next { border:1px solid #999999; color:#666666; } -#facebox .body .pagination .pagination_previous:hover, -#facebox .body .pagination .pagination_next:hover { +#facebox .body .pagination .pagination-previous:hover, +#facebox .body .pagination .pagination-next:hover { background-color:#aaaaaa; color:black; } -#facebox .body .pagination .pagination_currentpage { +#facebox .body .pagination .pagination-currentpage { background-color:#666666; border:1px solid #666666; color:white; diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php index 2855a5576..21b296db4 100644 --- a/mod/embed/views/default/embed/embed.php +++ b/mod/embed/views/default/embed/embed.php @@ -149,9 +149,9 @@ $(document).ready(function() { return false; } - $('.pagination_number').click(elggPaginationClick); - $('.pagination_next').click(elggPaginationClick); - $('.pagination_previous').click(elggPaginationClick); + $('.pagination-number').click(elggPaginationClick); + $('.pagination-next').click(elggPaginationClick); + $('.pagination-previous').click(elggPaginationClick); }); diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php index 8cc60753c..fc5545df0 100644 --- a/mod/embed/views/default/embed/item/list.php +++ b/mod/embed/views/default/embed/item/list.php @@ -41,8 +41,8 @@ if ($ecml_keyword) { } $icon = "getIcon($icon_size)}\" />"; -$info = "

" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "

"; -$info .= "

" . elgg_view_friendly_time($vars['item']->time_created) . "

"; +$info = "

" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "

"; +$info .= "

" . elgg_view_friendly_time($vars['item']->time_created) . "

"; // @todo is this approach better than inline js? echo "
getGUID()}\">" . elgg_view_listing($icon, $info) . '
'; diff --git a/mod/embed/views/default/embed/js.php b/mod/embed/views/default/embed/js.php index fbc6a0340..4f4663f40 100644 --- a/mod/embed/views/default/embed/js.php +++ b/mod/embed/views/default/embed/js.php @@ -112,7 +112,7 @@ $.extend($.facebox, { settings: { opacity : 0.7, overlay : true, - loadingImage : '_graphics/ajax_loader_bw.gif', + loadingImage : '_graphics/ajax-loader_bw.gif', closeImage : '_graphics/spacer.gif', imageTypes : [ 'png', 'jpg', 'jpeg', 'gif' ], faceboxHtml : '\ diff --git a/mod/embed/views/default/object/file/embedlist.php b/mod/embed/views/default/object/file/embedlist.php index bf306b4e7..c6595ab36 100644 --- a/mod/embed/views/default/object/file/embedlist.php +++ b/mod/embed/views/default/object/file/embedlist.php @@ -2,16 +2,16 @@ $file = $vars['entity']; $friendlytime = elgg_view_friendly_time($vars['entity']->time_created); - $info = "

getURL()}\">{$file->title}

"; - $info .= "

{$friendlytime}"; + $info = "

getURL()}\">{$file->title}

"; + $info .= "

{$friendlytime}"; $icon = "getURL()}\">" . elgg_view("file/icon", array("mimetype" => $file->mimetype, 'thumbnail' => $file->thumbnail, 'file_guid' => $file->guid, 'size' => 'small')) . ""; ?>

-
-
+
+
-
+
-- cgit v1.2.3