aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-12 12:28:51 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-07-12 12:28:51 +0000
commite84028f2e25a96d96bc02bf45e87f4422e11f2f8 (patch)
tree6592866bf7ee3a943fe32a643d02e64e05986acd
parent626715d5acef3079af461c3fb11e2131c2454163 (diff)
downloadelgg-e84028f2e25a96d96bc02bf45e87f4422e11f2f8.tar.gz
elgg-e84028f2e25a96d96bc02bf45e87f4422e11f2f8.tar.bz2
Added logos to embed web services pane, and made embed nav-bar theme agnostic
git-svn-id: http://code.elgg.org/elgg/trunk@6699 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/ecml/graphics/logo_bliptv.gifbin0 -> 2048 bytes
-rw-r--r--mod/ecml/graphics/logo_dailymotion.gifbin0 -> 2270 bytes
-rw-r--r--mod/ecml/graphics/logo_googlemaps.gifbin0 -> 2632 bytes
-rw-r--r--mod/ecml/graphics/logo_livevideo.gifbin0 -> 2234 bytes
-rw-r--r--mod/ecml/graphics/logo_redlasso.gifbin0 -> 2078 bytes
-rw-r--r--mod/ecml/graphics/logo_slideshare.gifbin0 -> 3039 bytes
-rw-r--r--mod/ecml/graphics/logo_vimeo.gifbin0 -> 1783 bytes
-rw-r--r--mod/ecml/graphics/logo_youtube.gifbin0 -> 2174 bytes
-rw-r--r--mod/ecml/views/default/ecml/admin/css.php52
-rw-r--r--mod/ecml/views/default/embed/web_services/content.php2
-rw-r--r--mod/embed/views/default/embed/css.php51
11 files changed, 98 insertions, 7 deletions
diff --git a/mod/ecml/graphics/logo_bliptv.gif b/mod/ecml/graphics/logo_bliptv.gif
new file mode 100644
index 000000000..13620b9fd
--- /dev/null
+++ b/mod/ecml/graphics/logo_bliptv.gif
Binary files differ
diff --git a/mod/ecml/graphics/logo_dailymotion.gif b/mod/ecml/graphics/logo_dailymotion.gif
new file mode 100644
index 000000000..48d4cff8d
--- /dev/null
+++ b/mod/ecml/graphics/logo_dailymotion.gif
Binary files differ
diff --git a/mod/ecml/graphics/logo_googlemaps.gif b/mod/ecml/graphics/logo_googlemaps.gif
new file mode 100644
index 000000000..0f8835304
--- /dev/null
+++ b/mod/ecml/graphics/logo_googlemaps.gif
Binary files differ
diff --git a/mod/ecml/graphics/logo_livevideo.gif b/mod/ecml/graphics/logo_livevideo.gif
new file mode 100644
index 000000000..86afeabe4
--- /dev/null
+++ b/mod/ecml/graphics/logo_livevideo.gif
Binary files differ
diff --git a/mod/ecml/graphics/logo_redlasso.gif b/mod/ecml/graphics/logo_redlasso.gif
new file mode 100644
index 000000000..96ac9b78c
--- /dev/null
+++ b/mod/ecml/graphics/logo_redlasso.gif
Binary files differ
diff --git a/mod/ecml/graphics/logo_slideshare.gif b/mod/ecml/graphics/logo_slideshare.gif
new file mode 100644
index 000000000..ff082171e
--- /dev/null
+++ b/mod/ecml/graphics/logo_slideshare.gif
Binary files differ
diff --git a/mod/ecml/graphics/logo_vimeo.gif b/mod/ecml/graphics/logo_vimeo.gif
new file mode 100644
index 000000000..4215e74bc
--- /dev/null
+++ b/mod/ecml/graphics/logo_vimeo.gif
Binary files differ
diff --git a/mod/ecml/graphics/logo_youtube.gif b/mod/ecml/graphics/logo_youtube.gif
new file mode 100644
index 000000000..7cfdd054c
--- /dev/null
+++ b/mod/ecml/graphics/logo_youtube.gif
Binary files differ
diff --git a/mod/ecml/views/default/ecml/admin/css.php b/mod/ecml/views/default/ecml/admin/css.php
index c51f04a75..b83d0566f 100644
--- a/mod/ecml/views/default/ecml/admin/css.php
+++ b/mod/ecml/views/default/ecml/admin/css.php
@@ -33,10 +33,58 @@
}
.ecml_web_service_list li {
list-style: none;
- margin:0 20px 0 0;
+ margin:0 0 0 0;
padding:0;
- display:inline;
+ /* display:inline; */
+
+}
+.ecml_web_service_list li a {
+ display:block;
+ float:left;
+ height:41px;
+ width:152px;
+ background-position: center center;
+ background-repeat: no-repeat;
+ text-indent: -900em;
+ border:2px solid transparent;
+ margin:0 20px 10px 0;
+}
+.ecml_web_service_list li a.selected {
+ border-color:#999999;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+}
+.ecml_web_service_list li a.youtube {
+ background-image: url(<?php echo $vars['url']; ?>mod/ecml/graphics/logo_youtube.gif);
+ width:102px;
+}
+.ecml_web_service_list li a.slideshare {
+ background-image: url(<?php echo $vars['url']; ?>mod/ecml/graphics/logo_slideshare.gif);
}
+.ecml_web_service_list li a.vimeo {
+ background-image: url(<?php echo $vars['url']; ?>mod/ecml/graphics/logo_vimeo.gif);
+ width:130px;
+}
+.ecml_web_service_list li a.googlemaps {
+ background-image: url(<?php echo $vars['url']; ?>mod/ecml/graphics/logo_googlemaps.gif);
+}
+.ecml_web_service_list li a.blip_tv {
+ background-image: url(<?php echo $vars['url']; ?>mod/ecml/graphics/logo_bliptv.gif);
+ width:102px;
+}
+.ecml_web_service_list li a.dailymotion {
+ background-image: url(<?php echo $vars['url']; ?>mod/ecml/graphics/logo_dailymotion.gif);
+}
+.ecml_web_service_list li a.livevideo {
+ background-image: url(<?php echo $vars['url']; ?>mod/ecml/graphics/logo_livevideo.gif);
+ width:166px;
+}
+.ecml_web_service_list li a.redlasso {
+ background-image: url(<?php echo $vars['url']; ?>mod/ecml/graphics/logo_redlasso.gif);
+ background-position:center 4px;
+ width:130px;
+}
+
.embed_content_section {
border:none;
-webkit-border-radius: 5px;
diff --git a/mod/ecml/views/default/embed/web_services/content.php b/mod/ecml/views/default/embed/web_services/content.php
index 83f8363a7..125da80a2 100644
--- a/mod/ecml/views/default/embed/web_services/content.php
+++ b/mod/ecml/views/default/embed/web_services/content.php
@@ -15,7 +15,7 @@ $keywords = ecml_get_keywords();
elgg_sort_3d_array_by_value($keywords, 'name');
$keyword_js_array = array();
-$keywords_html = "<ul class='ecml_web_service_list'>";
+$keywords_html = "<ul class='ecml_web_service_list clearfloat'>";
// include support for standard ECML so you can get previews and validation.
//$keyword_html = '<li class="ecml_web_service"><a class="ecml">Generic ECML</a></li>';
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 64d74a498..ba1d96190 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -118,11 +118,54 @@
}
-/* navigation overrides */
-.elgg_horizontal_tabbed_nav .selected a.embed_section,
-.elgg_horizontal_tabbed_nav a.embed_section:hover {
- color:#333333;
+/* ***************************************
+ ELGG TABBED PAGE NAVIGATION
+*************************************** */
+#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 {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
+#facebox .body .elgg_horizontal_tabbed_nav li {
+ float: left;
+ border: 2px solid #cccccc;
+ border-bottom-width: 0;
+ background: #eeeeee;
+ margin: 0 0 0 10px;
+ -moz-border-radius-topleft:5px;
+ -moz-border-radius-topright:5px;
+ -webkit-border-top-left-radius:5px;
+ -webkit-border-top-right-radius:5px;
+}
+#facebox .body .elgg_horizontal_tabbed_nav a {
+ text-decoration: none;
+ display: block;
+ padding:3px 10px 0 10px;
+ text-align: center;
+ height:21px;
+ color:#999999;
+}
+#facebox .body .elgg_horizontal_tabbed_nav a:hover {
+ background: #dedede;
+ color:#666666;
+}
+#facebox .body .elgg_horizontal_tabbed_nav .selected {
+ border-color: #cccccc;
+ background: white;
}
+#facebox .body .elgg_horizontal_tabbed_nav .selected a {
+ position: relative;
+ top: 2px;
+ background: white;
+}
+
/* Pagination (override core elgg css defaults) */