Mercurial > hg > digilib-old
changeset 773:19754e80cc9f jquery
merge
with 33b5477f8d84cc3e76f0d3dee73e8d26f4dd06dd
author | robcast |
---|---|
date | Thu, 10 Feb 2011 23:41:01 +0100 |
parents | 6d7c51e4724b (diff) 33b5477f8d84 (current diff) |
children | 4568e539abd2 34bba748004d |
files | |
diffstat | 9 files changed, 9 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/client/digitallibrary/jquery/img/embedded.svg Thu Feb 10 23:38:03 2011 +0100 +++ b/client/digitallibrary/jquery/img/embedded.svg Thu Feb 10 23:41:01 2011 +0100 @@ -49,7 +49,7 @@ inkscape:pageshadow="2" inkscape:zoom="16.533016" inkscape:cx="15.816836" - inkscape:cy="16.69448" + inkscape:cy="9.7629524" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -86,8 +86,7 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1020.3622)" - style="display:inline" - sodipodi:insensitive="true" /> + style="display:inline" /> <g inkscape:groupmode="layer" id="layer2" @@ -928,7 +927,8 @@ inkscape:groupmode="layer" id="layer11" inkscape:label="mirror-horizontal" - style="display:none"> + style="display:none" + sodipodi:insensitive="true"> <path inkscape:connector-curvature="0" style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
--- a/client/digitallibrary/jquery/jquery-test-full.html Thu Feb 10 23:38:03 2011 +0100 +++ b/client/digitallibrary/jquery/jquery-test-full.html Thu Feb 10 23:41:01 2011 +0100 @@ -39,6 +39,7 @@ padding: 0px 5px; font-family: Arial; font-size: 9px; + display: none; } div._log { @@ -69,15 +70,6 @@ }; var $div = $('div.digilib'); $div.digilib(opts); - var obj = { - 'initExtension' : function() { - var settings = $(this).data('digilib').settings; - console.debug('initExtension:', this, 'settings:', settings); - }, - 'options' : { 'test' : 'content of option "test"' }, - }; - $div.digilib('extendPlugin', obj); - $div.digilib('initExtension'); }); </script>
--- a/client/digitallibrary/jquery/jquery.digilib.css Thu Feb 10 23:38:03 2011 +0100 +++ b/client/digitallibrary/jquery/jquery.digilib.css Thu Feb 10 23:41:01 2011 +0100 @@ -67,11 +67,11 @@ } div.digilib.dl_fullscreen div.button:hover { - background-image: url('../greyskin/corona.png'); + background-image: url('img/fullscreen/corona.png'); } div.digilib.dl_fullscreen div.button-on { - background-color: white; + background-image: url('img/fullscreen/whitedisc.png'); } div.digilib.dl_fullscreen div.birdview {
--- a/client/digitallibrary/jquery/svg/svgBasics.html Thu Feb 10 23:38:03 2011 +0100 +++ b/client/digitallibrary/jquery/svg/svgBasics.html Thu Feb 10 23:41:01 2011 +0100 @@ -62,7 +62,8 @@ svg.clear(); } else if (shape == 'zoom') { - svg.clear(); + svg.configure({viewBox: '0 0 800 1000'}, true); + //svg.animate({svgViewBox: '0, 0, 100, 100'}, 2000); } }