[Mapbender-commits] r5396 - in trunk/mapbender: http/javascripts
resources/db/pgsql/UTF-8/update
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Jan 21 07:55:15 EST 2010
Author: christoph
Date: 2010-01-21 07:55:14 -0500 (Thu, 21 Jan 2010)
New Revision: 5396
Modified:
trunk/mapbender/http/javascripts/mod_dragMapSize.php
trunk/mapbender/http/javascripts/mod_navFrame.php
trunk/mapbender/http/javascripts/mod_tab.js
trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql
Log:
dragMapSize, navFrame, tabs are noew themeroller ready!
Modified: trunk/mapbender/http/javascripts/mod_dragMapSize.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dragMapSize.php 2010-01-21 12:25:01 UTC (rev 5395)
+++ trunk/mapbender/http/javascripts/mod_dragMapSize.php 2010-01-21 12:55:14 UTC (rev 5396)
@@ -46,6 +46,13 @@
function mod_dragMapSize_init(){
var el = document.getElementById("dragMapSize");
el.onmousedown = mod_dragMapSize_down;
+ $(el).hover(function () {
+ $(this).addClass("ui-state-hover");
+ },
+ function () {
+ $(this).removeClass("ui-state-hover");
+ }
+ );
mod_dragMapSize_arrange();
}
@@ -63,6 +70,7 @@
//create a div that catches all mouse interactions
var dragElement = document.getElementById("dragMapSize");
+ $(dragElement).addClass("ui-state-active");
var mouseCatcher = dragElement.parentNode.appendChild(document.createElement('div'));
mouseCatcher.setAttribute("id", "dragMapSize_helper");
mouseCatcher.style.position = "absolute";
@@ -83,6 +91,9 @@
document.onmouseup = null;
document.onmousemove = null;
+ var dragElement = document.getElementById("dragMapSize");
+ $(dragElement).removeClass("ui-state-active");
+
var mouseCatcher = document.getElementById("dragMapSize_helper");
mouseCatcher.parentNode.removeChild(mouseCatcher);
Modified: trunk/mapbender/http/javascripts/mod_navFrame.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_navFrame.php 2010-01-21 12:25:01 UTC (rev 5395)
+++ trunk/mapbender/http/javascripts/mod_navFrame.php 2010-01-21 12:55:14 UTC (rev 5396)
@@ -27,8 +27,6 @@
echo "var mod_navFrame_target = '".$e_target[0]."';";
echo "var mod_navFrame_id = '".$e_id."';";
echo "var mod_navFrame_src = '".$e_src."';";
-echo "var backGroundColor = '".$backGroundColor."';";
-echo "var backGroundHoverColor = '".$backGroundHoverColor."';";
?>
@@ -36,42 +34,49 @@
<?php
$html = <<<HTML
-<div id="mbN_$e_id" style="position:absolute;width:0;height:0;top:0;left:0;background-color:$backGroundColor;" >
-<img id="arrow_n_$e_id" title="move map to north" style="position:relative;top:0;left:0;cursor:pointer;" src="../img/arrows/arrow_n.gif" width="15" height="10" onmouseover="getElementById(\'mbN_$e_id\').style.backgroundColor=\'$backGroundHoverColor\'" onmouseout="getElementById(\'mbN_$e_id\').style.backgroundColor=\'$backGroundColor\'" />
+<div id="mbN_$e_id" style="position:absolute;border:0px;width:0;height:0;top:0;left:0;" class="ui-state-default">
+<img id="arrow_n_$e_id" title="move map to north" style="position:relative;top:0;left:0;" src="../img/arrows/arrow_n.gif" width="15" height="10" />
</div>
-<div id="mbNE_$e_id" style="position:absolute;width:0;height:0;top:0;left:0;background-color:$backGroundColor;">
-<img id="arrow_ne_$e_id" title="move map to north-east" style="position:relative;top:0;left:0;cursor:pointer;" src="../img/arrows/arrow_ne.gif" width="10" height="10" onmouseover="getElementById(\'mbNE_$e_id\').style.backgroundColor=\'$backGroundHoverColor\'" onmouseout="getElementById(\'mbNE_$e_id\').style.backgroundColor=\'$backGroundColor\'" />
+<div id="mbNE_$e_id" style="position:absolute;border:0px;width:0;height:0;top:0;left:0;" class="ui-state-default">
+<img id="arrow_ne_$e_id" title="move map to north-east" style="position:relative;top:0;left:0;" src="../img/arrows/arrow_ne.gif" width="10" height="10" />
</div>
-<div id="mbE_$e_id" style="position:absolute;width:0;height:0;top:0;left:0;background-color:$backGroundColor;">
-<img id="arrow_e_$e_id" title="move map to east"style="position:relative;top:0;left:0;cursor:pointer;" src="../img/arrows/arrow_e.gif" width="10" height="15" onmouseover="getElementById(\'mbE_$e_id\').style.backgroundColor=\'$backGroundHoverColor\'" onmouseout="getElementById(\'mbE_$e_id\').style.backgroundColor=\'$backGroundColor\'" />
+<div id="mbE_$e_id" style="position:absolute;border:0px;width:0;height:0;top:0;left:0;" class="ui-state-default">
+<img id="arrow_e_$e_id" title="move map to east"style="position:relative;top:0;left:0;" src="../img/arrows/arrow_e.gif" width="10" height="15" />
</div>
-<div id="mbSE_$e_id" style="position:absolute;width:0;height:0;top:0;left:0;background-color:$backGroundColor;">
-<img id="arrow_se_$e_id" title="move map to south-east" style="position:relative;top:0;left:0;cursor:pointer;" src="../img/arrows/arrow_se.gif" width="10" height="10" onmouseover="getElementById(\'mbSE_$e_id\').style.backgroundColor=\'$backGroundHoverColor\'" onmouseout="getElementById(\'mbSE_$e_id\').style.backgroundColor=\'$backGroundColor\'" />
+<div id="mbSE_$e_id" style="position:absolute;border:0px;width:0;height:0;top:0;left:0;" class="ui-state-default">
+<img id="arrow_se_$e_id" title="move map to south-east" style="position:relative;top:0;left:0;" src="../img/arrows/arrow_se.gif" width="10" height="10" />
</div>
-<div id="mbS_$e_id" style="position:absolute;width:0;height:0;top:0;left:0;background-color:$backGroundColor;">
-<img id="arrow_s_$e_id" title="move map to south" style="position:relative;top:0;left:0;cursor:pointer;" src="../img/arrows/arrow_s.gif" width="15" height="10" onmouseover="getElementById(\'mbS_$e_id\').style.backgroundColor=\'$backGroundHoverColor\'" onmouseout="getElementById(\'mbS_$e_id\').style.backgroundColor=\'$backGroundColor\'" />
+<div id="mbS_$e_id" style="position:absolute;border:0px;width:0;height:0;top:0;left:0;" class="ui-state-default">
+<img id="arrow_s_$e_id" title="move map to south" style="position:relative;top:0;left:0;" src="../img/arrows/arrow_s.gif" width="15" height="10" />
</div>
-<div id="mbSW_$e_id" style="position:absolute;width:0;height:0;top:0;left:0;background-color:$backGroundColor;">
-<img id="arrow_sw_$e_id" title="move map to south-west" style="position:relative;top:0;left:0;cursor:pointer;" src="../img/arrows/arrow_sw.gif" width="10" height="10" onmouseover="getElementById(\'mbSW_$e_id\').style.backgroundColor=\'$backGroundHoverColor\'" onmouseout="getElementById(\'mbSW_$e_id\').style.backgroundColor=\'$backGroundColor\'" />
+<div id="mbSW_$e_id" style="position:absolute;border:0px;width:0;height:0;top:0;left:0;" class="ui-state-default">
+<img id="arrow_sw_$e_id" title="move map to south-west" style="position:relative;top:0;left:0;" src="../img/arrows/arrow_sw.gif" width="10" height="10" />
</div>
-<div id="mbW_$e_id" style="position:absolute;width:0;height:0;top:0;left:0;background-color:$backGroundColor;">
-<img id="arrow_w_$e_id" title="move map to west" style="position:relative;top:0;left:0;cursor:pointer;" src="../img/arrows/arrow_w.gif" width="10" height="15" onmouseover="getElementById(\'mbW_$e_id\').style.backgroundColor=\'$backGroundHoverColor\'" onmouseout="getElementById(\'mbW_$e_id\').style.backgroundColor=\'$backGroundColor\'" />
+<div id="mbW_$e_id" style="position:absolute;border:0px;width:0;height:0;top:0;left:0;" class="ui-state-default">
+<img id="arrow_w_$e_id" title="move map to west" style="position:relative;top:0;left:0;" src="../img/arrows/arrow_w.gif" width="10" height="15" />
</div>
-<div id="mbNW_$e_id" style="position:absolute;width:0;height:0;top:0;left:0;background-color:$backGroundColor;">
-<img id="arrow_nw_$e_id" title="move map to north-west" style="position:relative;top:0;left:0;cursor:pointer;" src="../img/arrows/arrow_nw.gif" width="10" height="10" onmouseover="getElementById(\'mbNW_$e_id\').style.backgroundColor=\'$backGroundHoverColor\'" onmouseout="getElementById(\'mbNW_$e_id\').style.backgroundColor=\'$backGroundColor\'" />
+<div id="mbNW_$e_id" style="position:absolute;border:0px;width:0;height:0;top:0;left:0;" class="ui-state-default">
+<img id="arrow_nw_$e_id" title="move map to north-west" style="position:relative;top:0;left:0;" src="../img/arrows/arrow_nw.gif" width="10" height="10" />
</div>
HTML;
echo "var html = '" . str_replace("\n", "\\n", $html) . "';";
?>
- $("#" + mod_navFrame_id).html(html);
+ $("#" + mod_navFrame_id).html(html).children("div").css("cursor", "pointer").hover(
+ function () {
+ $(this).addClass("ui-state-hover");
+ },
+ function () {
+ $(this).removeClass("ui-state-hover");
+ }
+ );
eventInit.register(function () {
var directionArray = ["N", "NE", "E", "SE", "S", "SW", "W", "NW"];
for (var i in directionArray) {
(function () {
var currentDirection = directionArray[i];
-// $("#mb"+currentDirection+"_"+mod_navFrame_id).click(function () {
- $("#arrow_"+currentDirection.toLowerCase()+"_"+mod_navFrame_id).click(function () {
+ $("#mb"+currentDirection+"_"+mod_navFrame_id).click(function () {
+// $("#arrow_"+currentDirection.toLowerCase()+"_"+mod_navFrame_id).click(function () {
mod_navFrame(currentDirection);
});
}());
Modified: trunk/mapbender/http/javascripts/mod_tab.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_tab.js 2010-01-21 12:25:01 UTC (rev 5395)
+++ trunk/mapbender/http/javascripts/mod_tab.js 2010-01-21 12:55:14 UTC (rev 5396)
@@ -82,7 +82,7 @@
node.id = "tabs_" + that.module;
//set css class
- node.className = "verticalTabs";
+ node.className = "verticalTabs ui-widget-header";
//mandatory style entries
node.style.position = "absolute";
Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql 2010-01-21 12:25:01 UTC (rev 5395)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql 2010-01-21 12:55:14 UTC (rev 5396)
@@ -1094,4 +1094,16 @@
-- mapframe1 is now a jQuery plugin
UPDATE gui_element SET e_js_file = '../plugins/mb_map.js' WHERE e_id = 'mapframe1';
-UPDATE gui_element SET e_js_file = '../plugins/mb_overview.js' WHERE e_id = 'overview';
\ No newline at end of file
+UPDATE gui_element SET e_js_file = '../plugins/mb_overview.js' WHERE e_id = 'overview';
+
+--dragmapsize is themeroller ready
+UPDATE gui_element SET e_attributes = 'class="ui-state-default"', e_more_styles = 'font-size:1px; cursor:move; width:10; height:10;' WHERE e_id = 'dragMapSize';
+
+--tabs are themeroller ready
+UPDATE gui_element_vars SET var_value = 'position:absolute;visibility:visible;cursor:pointer;' WHERE var_name = 'tab_style' AND fkey_e_id = 'tabs';
+
+--nav frame is themeroller ready
+DELETE FROM gui_element_vars WHERE var_name = 'backGroundColor' AND fkey_e_id = 'navFrame';
+DELETE FROM gui_element_vars WHERE var_name = 'backGroundHoverColor' AND fkey_e_id = 'navFrame';
+
+
More information about the Mapbender_commits
mailing list