# HG changeset patch # User hertzhaft # Date 1297983053 -3600 # Node ID 61e4e5d679ba3d823701d78bd6493eccde47d7ea # Parent ddb28f6b066a7598d83f826116227ab325a4d9b7 english section headings in unit dropdown diff -r ddb28f6b066a -r 61e4e5d679ba client/digitallibrary/jquery/svg/archimedes.xml --- a/client/digitallibrary/jquery/svg/archimedes.xml Thu Feb 17 22:50:32 2011 +0100 +++ b/client/digitallibrary/jquery/svg/archimedes.xml Thu Feb 17 23:50:53 2011 +0100 @@ -1,25 +1,25 @@ -

Angaben nach:

+

Data for measurement units taken from:

Klimpert, Richard: Lexikon der Münzen, Maße, Gewichte, Zählarten und Zeitgrößen aller Länder der Erde 2) Berlin 1896 (Reprint Graz 1972)

Doursther, Horace: Dictionnaire universel des poids et mesures anciens et modernes. Paris 1840 (Reprint Amsterdam 1965)

 -
+
-
- - +
+ +
-
+
@@ -28,40 +28,40 @@
-
- - - - - - - - - - - - - +
+ + + + + + + + + + + + + - - + + - + - + - - - - - + + + + +
-
+
@@ -81,17 +81,17 @@
-
+
- +
-
- +
+
-
+
@@ -112,155 +112,46 @@
-
- - - - - - - +
+ + + + + + +
-
- - - - - - +
+ + + + + + - - - + + + - - - - -
-
- - - - - -
-
- - - - - - -
-
- - - -
-
- - - - - - - - -
-
- - - - - - -
-
- - - - - - - - - + + + +
-
- - - - - - - - - - - - - - - -
-
- - - - - - - - -
-
- - - - - -
-
- - - - - - -
-
- - - - - -
-
- - - - - - - - - -
-
- - - - - - - - - - - +
+ + + + + + + + + + +
diff -r ddb28f6b066a -r 61e4e5d679ba client/digitallibrary/jquery/svg/jquery.digilibSVG.css --- a/client/digitallibrary/jquery/svg/jquery.digilibSVG.css Thu Feb 17 22:50:32 2011 +0100 +++ b/client/digitallibrary/jquery/svg/jquery.digilibSVG.css Thu Feb 17 23:50:53 2011 +0100 @@ -45,6 +45,11 @@ border: none; } +option.section { + border-bottom: 1px dotted grey; + padding-left: 10px; +} + input.svg-input { width: 50px; font-size: 12px; diff -r ddb28f6b066a -r 61e4e5d679ba client/digitallibrary/jquery/svg/jquery.digilibSVG.js --- a/client/digitallibrary/jquery/svg/jquery.digilibSVG.js Thu Feb 17 22:50:32 2011 +0100 +++ b/client/digitallibrary/jquery/svg/jquery.digilibSVG.js Thu Feb 17 23:50:53 2011 +0100 @@ -91,6 +91,8 @@ snapMidPoints : false, // snap to circle centers snapCenters : false, + // snap distance (in screen pixels) + snapDistance : 5, // keep original object when moving/scaling/rotating keepOriginal : false, // number of copies when drawing grids @@ -109,26 +111,33 @@ } // console.debug($xml); var $xml = $(settings.xml); - var units = []; - $xml.find("unit").each(function() { - units.push({ - 'name' : $(this).attr("name"), - 'factor' : $(this).attr("factor"), - 'add' : $(this).attr("add"), - 'subunits' : $(this).attr("subunits") - }); - }); - settings.units = units; // unit selects var $unit1 = $(''); - for (var i = 0; i < units.length; i++) { - var name = units[i].name; - var $opt = $(''); - $opt.data(pluginName, units[i]); + + $xml.find("section").each(function() { + var $section = $(this); + var name = $section.attr("name"); + // append section name as option + var $opt = $(''); $unit1.append($opt); $unit2.append($opt.clone()); - } + $section.find("unit").each(function() { + var $unit = $(this); + var name = $unit.attr("name"); + var factor = $unit.attr("factor"); + var $opt = $(''); + $opt.data(pluginName, { + 'name' : name, + 'factor' : factor, + 'add' : $unit.attr("add"), + 'subunits' : $unit.attr("subunits") + }); + $unit1.append($opt); + $unit2.append($opt.clone()); + }); + }); + // settings.units = units; // other elements var $la1 = $('pixel'); var $la2 = $('factor');