# HG changeset patch # User robcast # Date 1461674815 -7200 # Node ID 809b69312e60573d147b083b2a8c6fc62fe46157 # Parent 4fd4edc35b6d847e5d0859c4738640c83e1f7719 added authenticate button for oauth plugin. removed old SVG files. diff -r 4fd4edc35b6d -r 809b69312e60 webapp/src/main/webapp/jquery/img/dl-buttons-full-32-sprite.png Binary file webapp/src/main/webapp/jquery/img/dl-buttons-full-32-sprite.png has changed diff -r 4fd4edc35b6d -r 809b69312e60 webapp/src/main/webapp/jquery/img/fullscreen.svg --- a/webapp/src/main/webapp/jquery/img/fullscreen.svg Mon Apr 25 12:56:14 2016 +0200 +++ b/webapp/src/main/webapp/jquery/img/fullscreen.svg Tue Apr 26 14:46:55 2016 +0200 @@ -2,71 +2,136 @@ - + id="linearGradient4776"> + style="stop-color:#008000;stop-opacity:1;" + offset="0" + id="stop4778" /> + style="stop-color:#008000;stop-opacity:0;" + offset="1" + id="stop4780" /> - + id="linearGradient7314" + osb:paint="solid"> + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop7316" /> + + + + + + + + + + id="stop1312" + offset="0" + style="stop-color:#ff0000;stop-opacity:1;" /> + + id="linearGradient3082"> + + style="stop-color:#ff0000;stop-opacity:0;" + offset="1" + id="stop3086" /> + + + + id="stop3967" + offset="1" + style="stop-color:#db4521;stop-opacity:1;" /> + + + + style="stop-color:#e46648;stop-opacity:1;" + offset="1" + id="stop3080" /> + + inkscape:snap-global="true" + inkscape:snap-nodes="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + gridtolerance="20"> + @@ -111,88 +188,112 @@ image/svg+xml - + - + + + + - - - - + + + + + + + + + + + + + - - - - - - - + d="M 37.003838,24.159009 24.095538,36.969196 11.065445,24.164107 z" + style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.31801748;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="cccc" /> + + + - - + + + + + + diff -r 4fd4edc35b6d -r 809b69312e60 webapp/src/main/webapp/jquery/img/fullscreen/32/authenticate.png Binary file webapp/src/main/webapp/jquery/img/fullscreen/32/authenticate.png has changed diff -r 4fd4edc35b6d -r 809b69312e60 webapp/src/main/webapp/jquery/img/fullscreen2.svg --- a/webapp/src/main/webapp/jquery/img/fullscreen2.svg Mon Apr 25 12:56:14 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1203 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 4fd4edc35b6d -r 809b69312e60 webapp/src/main/webapp/jquery/img/fullscreen3.svg --- a/webapp/src/main/webapp/jquery/img/fullscreen3.svg Mon Apr 25 12:56:14 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1950 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 4fd4edc35b6d -r 809b69312e60 webapp/src/main/webapp/jquery/img/gen_fullscreen_icons.sh --- a/webapp/src/main/webapp/jquery/img/gen_fullscreen_icons.sh Mon Apr 25 12:56:14 2016 +0200 +++ b/webapp/src/main/webapp/jquery/img/gen_fullscreen_icons.sh Tue Apr 26 14:46:55 2016 +0200 @@ -2,7 +2,7 @@ # # script for creating PNG icons from icon SVG file -SVGFILE="fullscreen3.svg" +SVGFILE="fullscreen.svg" XSLTFILE="gen_fullscreen_icons.xsl" SVGDIR="fullscreen/svg_gen" # PNG directory relative to SVGDIR @@ -16,15 +16,16 @@ $SAXON $SVGFILE $XSLTFILE # create PNGs from separate SVGs using inkscape -INKSCAPE=" /Volumes/Schlachteplatte/Applications/Inkscape.app/Contents/Resources/bin/inkscape" +INKSCAPE=" /Volumes/User/Applications/Inkscape.app/Contents/Resources/bin/inkscape" #INKSCAPE=" /Applications/Inkscape.app/Contents/Resources/bin/inkscape" echo "running Inkscape to create PNGs" cd $SVGDIR +WD=$( pwd ) mkdir -p $PNGDIR ls *.svg | while read fx do f=`basename "$fx" svg` #$INKSCAPE --file="$fx" --export-area-drawing --export-height=32 --export-png="$PNGDIR/${f}png" - $INKSCAPE --file="$fx" --export-height=32 --export-png="$PNGDIR/${f}png" + $INKSCAPE --without-gui --file="$WD/$fx" --export-height=32 --export-png="$WD/$PNGDIR/${f}png" done echo "done." diff -r 4fd4edc35b6d -r 809b69312e60 webapp/src/main/webapp/jquery/jquery.digilib.buttons-full-32-sprite.css --- a/webapp/src/main/webapp/jquery/jquery.digilib.buttons-full-32-sprite.css Mon Apr 25 12:56:14 2016 +0200 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.buttons-full-32-sprite.css Tue Apr 26 14:46:55 2016 +0200 @@ -48,374 +48,381 @@ background-position: left -192px; } -#dl-button-back-img { +#dl-button-authenticate-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -224px; } -#dl-button-bg-img { +#dl-button-back-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -256px; } +#dl-button-bg-img { +width: 32px; +height: 32px; + background-image: url('img/dl-buttons-full-32-sprite.png'); + background-position: left -288px; +} + #dl-button-birds-eye-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -258px; + background-position: left -290px; } #dl-button-brightness-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -290px; + background-position: left -322px; } #dl-button-buttons-less-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -322px; + background-position: left -354px; } #dl-button-buttons-more-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -354px; + background-position: left -386px; } #dl-button-calibration-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -386px; + background-position: left -418px; } #dl-button-cat-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -418px; + background-position: left -450px; } #dl-button-contrast-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -450px; + background-position: left -482px; } #dl-button-corona-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -482px; + background-position: left -514px; } #dl-button-delallregions-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -514px; + background-position: left -546px; } #dl-button-delmark-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -546px; + background-position: left -578px; } #dl-button-delregion-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -578px; + background-position: left -610px; } #dl-button-delregions-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -610px; -} - -#dl-button-digilib-img { -width: 32px; -height: 32px; - background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -642px; } +#dl-button-digilib-img { +width: 32px; +height: 32px; + background-image: url('img/dl-buttons-full-32-sprite.png'); + background-position: left -674px; +} + #dl-button-findcoords-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -674px; + background-position: left -706px; } #dl-button-findregion-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -706px; + background-position: left -738px; } #dl-button-first-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -738px; -} - -#dl-button-fwd-img { -width: 32px; -height: 32px; - background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -770px; } -#dl-button-help-img { +#dl-button-fwd-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -802px; } -#dl-button-info-img { +#dl-button-help-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -834px; } -#dl-button-last-img { +#dl-button-info-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -866px; } +#dl-button-last-img { +width: 32px; +height: 32px; + background-image: url('img/dl-buttons-full-32-sprite.png'); + background-position: left -898px; +} + #dl-button-mark-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -898px; + background-position: left -930px; } #dl-button-measure-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -930px; + background-position: left -962px; } #dl-button-mirror-horizontal-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -962px; + background-position: left -994px; } #dl-button-mirror-vertical-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -994px; + background-position: left -1026px; } #dl-button-move-transparent-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1026px; + background-position: left -1058px; } #dl-button-options-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1058px; -} - -#dl-button-original-size-img { -width: 32px; -height: 32px; - background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -1090px; } -#dl-button-page-img { +#dl-button-original-size-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -1122px; } -#dl-button-pagewidth-img { +#dl-button-page-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -1154px; } +#dl-button-pagewidth-img { +width: 32px; +height: 32px; + background-image: url('img/dl-buttons-full-32-sprite.png'); + background-position: left -1186px; +} + #dl-button-quality-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1186px; + background-position: left -1218px; } #dl-button-reference-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1218px; + background-position: left -1250px; } #dl-button-regioninfo-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1250px; + background-position: left -1282px; } #dl-button-regions-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1282px; + background-position: left -1314px; } #dl-button-reset-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1314px; + background-position: left -1346px; } #dl-button-rgb-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1346px; + background-position: left -1378px; } #dl-button-rotate-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1378px; + background-position: left -1410px; } #dl-button-set-opacity-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1410px; + background-position: left -1442px; } #dl-button-showregions-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1442px; + background-position: left -1474px; } #dl-button-size-bigger-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1474px; -} - -#dl-button-size-smaller-img { -width: 32px; -height: 32px; - background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -1506px; } +#dl-button-size-smaller-img { +width: 32px; +height: 32px; + background-image: url('img/dl-buttons-full-32-sprite.png'); + background-position: left -1538px; +} + #dl-button-toggle-transparent-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1538px; + background-position: left -1570px; } #dl-button-whitedisc-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1570px; + background-position: left -1602px; } #dl-button-zoom-area-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1602px; -} - -#dl-button-zoom-full-img { -width: 32px; -height: 32px; - background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -1634px; } -#dl-button-zoom-in-img { +#dl-button-zoom-full-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -1666px; } -#dl-button-zoom-out-img { +#dl-button-zoom-in-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); background-position: left -1698px; } +#dl-button-zoom-out-img { +width: 32px; +height: 32px; + background-image: url('img/dl-buttons-full-32-sprite.png'); + background-position: left -1730px; +} + #dl-button-zoom-transparent-img { width: 32px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1730px; + background-position: left -1762px; } #dl-button-up-img { width: 32px; height: 16px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1762px; + background-position: left -1794px; } #dl-button-down-img { width: 32px; height: 16px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1778px; + background-position: left -1810px; } #dl-button-left-img { width: 16px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1794px; + background-position: left -1826px; } #dl-button-right-img { width: 16px; height: 32px; background-image: url('img/dl-buttons-full-32-sprite.png'); - background-position: left -1826px; + background-position: left -1858px; } diff -r 4fd4edc35b6d -r 809b69312e60 webapp/src/main/webapp/jquery/jquery.digilib.buttons-full-32.css --- a/webapp/src/main/webapp/jquery/jquery.digilib.buttons-full-32.css Mon Apr 25 12:56:14 2016 +0200 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.buttons-full-32.css Tue Apr 26 14:46:55 2016 +0200 @@ -42,6 +42,12 @@ background-image: url(img/fullscreen/32/annotations.png); /** sprite-ref: dl-buttons; */ } +#dl-button-authenticate-img { +width: 32px; +height: 32px; +background-image: url(img/fullscreen/32/authenticate.png); /** sprite-ref: dl-buttons; */ +} + #dl-button-back-img { width: 32px; height: 32px; diff -r 4fd4edc35b6d -r 809b69312e60 webapp/src/main/webapp/jquery/jquery.digilib.oauth.js --- a/webapp/src/main/webapp/jquery/jquery.digilib.oauth.js Mon Apr 25 12:56:14 2016 +0200 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.oauth.js Tue Apr 26 14:46:55 2016 +0200 @@ -40,7 +40,7 @@ authenticate : { onclick : "authenticate", tooltip : "Authenticate", - icon : "annotation-user.png" + icon : "authenticate.png" }, };