[marinemap] push by perrygeo...@gmail.com - Added scrollable icon image for bookmark; required some js changes to ... on 2011-10-28 19:26 GMT

[mari...@googlecode.com]

Revision: 0df3065fbaf3
Author: Matthew Perry <perryg...@gmail.com>
Date: Fri Oct 28 12:29:46 2011
Log: Added scrollable icon image for bookmark; required some js
changes to differentiate item styles from item actions.
http://code.google.com/p/marinemap/source/detail?r=0df3065fbaf3

Added:
/media/common/images/bookmark.png
Modified:
/lingcod/common/templates/common/map.html
/media/common/css/menu_items.css
/media/common/js/layout/menu_items.js

=======================================
--- /dev/null
+++ /media/common/images/bookmark.png Fri Oct 28 12:29:46 2011
Binary file, no diff available.
=======================================
--- /lingcod/common/templates/common/map.html Wed Oct 19 10:53:27 2011
+++ /lingcod/common/templates/common/map.html Fri Oct 28 12:29:46 2011
@@ -129,40 +129,36 @@
</div>

{% block menu_icons %}
+
<ul class="menu_items" id="header_buttons">
<li class="divider"><img
src="{{MEDIA_URL}}/common/images/header_divider.gif" height="32" width="2"
/></li>

{% if user.is_authenticated and bookmarks_as_feature %}
- <li>
- <span>
- <a id="bookmark-menu-link" title="Bookmark"
href="#Bookmark">
- <img
src="{{MEDIA_URL}}bookmarks/images/bookmark-menu.png"
id="bookmark-feature-img" width="32" height="32" />
- </a>
- </span>
- <div id="bookmark-close-container">
- <a id="bookmark-close" style="display:none;" href="#">
- <img
src="{{MEDIA_URL}}common/images/tool_window_pointer.png" width="23"
height="36" />
- </a>
+ <li id="bookmarks_menu" class="item">
+ <span>
+ <a id="bookmark-menu-link" title="Bookmark"
href="#Bookmark"><img src="{{MEDIA_URL}}common/images/transparent.gif"
width="44" height="48" /></a>
+ </span>
+ </li>
+ <div id="bookmark-close-container" style="position: absolute;
left:12px; top:35px;">
+ <a id="bookmark-close" style="display:none;" href="#"><img
src="{{MEDIA_URL}}common/images/tool_window_pointer.png" width="23"
height="36" /> </a>
</div>
- </li>
{% else %}
- <li id="bookmarks_menuitem" class="item">
- <span>
- <a title="Bookmark" href="#Bookmark">
- <img
src="{{MEDIA_URL}}bookmarks/images/bookmark-menu.png"
id="bookmark-menu-img" width="32" height="32" />
- </a>
- </span>
- </li>
+ <li id="bookmarks_menu" class="item item_trigger">
+ <span>
+ <a title="Bookmark" href="#Bookmark"><img
src="{{MEDIA_URL}}/common/images/transparent.gif" width="44" height="48"
/></a>
+ </span>
+ </li>
{% endif %}

<li class="divider"><img
src="{{MEDIA_URL}}/common/images/header_divider.gif" height="32" width="2"
/></li>
- <li id="layers_menu" class="item">
+ <li id="layers_menu" class="item item_trigger">
<span>
<a title="Data Layers" href="#DataLayers"><img
src="{{MEDIA_URL}}/common/images/transparent.gif" width="44" height="48"
/></a>
</span>
</li>
+
<li class="divider"><img
src="{{MEDIA_URL}}/common/images/header_divider.gif" height="32" width="2"
/></li>
- <li id="tools_menu" class="item">
+ <li id="tools_menu" class="item item_trigger">
<span>
<a title="Tools" href="#tools"><img
src="{{MEDIA_URL}}/common/images/transparent.gif" width="44" height="48"
/></a>
</span>
=======================================
--- /media/common/css/menu_items.css Tue Oct 18 15:32:18 2011
+++ /media/common/css/menu_items.css Fri Oct 28 12:29:46 2011
@@ -46,6 +46,7 @@
position:absolute;
left:350px;
top:0px;
+ width: 140px;
}

#layers_menu a {
@@ -55,6 +56,10 @@
#tools_menu a {
background: url(../images/gear.png) 0px 0px;
}
+
+#bookmarks_menu a {
+ background: url(../images/bookmark.png) 0px 0px;
+}

.menu_items li a:hover {
cursor: pointer;
=======================================
--- /media/common/js/layout/menu_items.js Wed Oct 19 11:26:14 2011
+++ /media/common/js/layout/menu_items.js Fri Oct 28 12:29:46 2011
@@ -5,7 +5,7 @@

var init = function(el){
that.el = el;
- that.el.find('li.item').each(function(){
+ that.el.find('li.item_trigger').each(function(){
var self = $(this);
var els = $('<a style="display:none;" class="close"
href="#"><img
src="'+lingcod.options.media_url+'common/images/tool_window_pointer.png"
width="23" height="36" /></a></a>');
els.click(function(){
@@ -43,7 +43,7 @@
that.init = init;

var closeAll = function(){
- var open = that.el.find('li.item.toggled');
+ var open = that.el.find('li.item_trigger.toggled');
if(open.length === 1){
$('.marinemap-panel:visible').each(function(){
$(this).find('.panelMask').hide();