From ae7d9143f4982a7fa8709cca4774a0808272ab3a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 11 Aug 2011 23:21:30 +0200 Subject: allow dynamicly determaning icons for fileactions --- files/js/fileactions.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/files/js/fileactions.js b/files/js/fileactions.js index a8de2f9977b..370b1773c68 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -62,6 +62,9 @@ FileActions={ for(name in actions){ if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){ var img=FileActions.icons[name]; + if(img.call){ + img=img(); + } var html=''; var element=$(html); if(img){ -- cgit v1.2.3 From 972f7d7e6083931babfc7d4a7534d02a76ad351d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 11 Aug 2011 23:23:59 +0200 Subject: forgot something --- files/js/fileactions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 370b1773c68..744ffd8cfed 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -63,7 +63,7 @@ FileActions={ if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){ var img=FileActions.icons[name]; if(img.call){ - img=img(); + img=img(file); } var html=''; var element=$(html); -- cgit v1.2.3 From 577f2952bda6550fa6f4064bac4d0785a24c63c0 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 11 Aug 2011 23:38:43 +0200 Subject: action icons are now ACTION ICONS --- core/css/styles.css | 4 +- core/img/actions/delete.png | Bin 330 -> 275 bytes core/img/actions/delete.svg | 8 +- core/img/actions/download.png | Bin 264 -> 246 bytes core/img/actions/download.svg | 8 +- core/img/actions/play-add.png | Bin 360 -> 275 bytes core/img/actions/play-add.svg | 32 +- core/img/actions/play.png | Bin 228 -> 220 bytes core/img/actions/play.svg | 8 +- core/img/actions/public.png | Bin 0 -> 459 bytes core/img/actions/public.svg | 292 +++++++ core/img/actions/rename.png | Bin 339 -> 310 bytes core/img/actions/rename.svg | 24 +- core/img/actions/share.png | Bin 478 -> 377 bytes core/img/actions/share.svg | 12 +- core/img/actions/shared.png | Bin 0 -> 437 bytes core/img/actions/shared.svg | 1738 +++++++++++++++++++++++++++++++++++++++++ core/img/places/world.png | Bin 895 -> 0 bytes core/img/places/world.svg | 300 ------- files/css/files.css | 1 - 20 files changed, 2077 insertions(+), 350 deletions(-) create mode 100644 core/img/actions/public.png create mode 100644 core/img/actions/public.svg create mode 100644 core/img/actions/shared.png create mode 100644 core/img/actions/shared.svg delete mode 100644 core/img/places/world.png delete mode 100644 core/img/places/world.svg diff --git a/core/css/styles.css b/core/css/styles.css index 75e30c9df38..ff12ab1e07c 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -91,7 +91,6 @@ legend { padding:.2em; font-size:1.2em; } #expand { margin:0 0 .2em 1.2em; cursor:pointer; } #expand+span { position:relative; bottom:.4em; left:.2em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; } #logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; } -#logout:hover, #logout:focus { background:rgba(0,0,0,.5); } /* USER SETTINGS ------------------------------------------------------------ */ #quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ccc; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; } @@ -102,3 +101,6 @@ li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ff #notification{ z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:block; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } + +.file_action, .selectedActions a, #logout { opacity:.5; } +.file_action:hover, .selectedActions a:hover, #logout:hover { opacity:1; } diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png index 97f089524b2..bc0c782882d 100644 Binary files a/core/img/actions/delete.png and b/core/img/actions/delete.png differ diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg index e542b6fed3a..86c8317d01d 100644 --- a/core/img/actions/delete.svg +++ b/core/img/actions/delete.svg @@ -14,7 +14,7 @@ id="svg3875" version="1.1" inkscape:version="0.48.1 r9760" - sodipodi:docname="drawing.svg"> + sodipodi:docname="delete.svg"> image/svg+xml - + @@ -61,7 +61,7 @@ id="layer1" transform="translate(0,-1036.3622)"> @@ -28,7 +28,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="17.921875" - inkscape:cx="4.954364" + inkscape:cx="-5.3403178" inkscape:cy="10.148736" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -54,7 +54,7 @@ image/svg+xml - + @@ -64,7 +64,7 @@ id="layer1" transform="translate(0,-1036.3622)"> image/svg+xml - + @@ -63,17 +63,21 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)"> - - + + + + diff --git a/core/img/actions/play.png b/core/img/actions/play.png index 5ddec405188..a252a751554 100644 Binary files a/core/img/actions/play.png and b/core/img/actions/play.png differ diff --git a/core/img/actions/play.svg b/core/img/actions/play.svg index b291eae2591..7bb7b5c262a 100644 --- a/core/img/actions/play.svg +++ b/core/img/actions/play.svg @@ -14,7 +14,7 @@ id="svg3875" version="1.1" inkscape:version="0.48.1 r9760" - sodipodi:docname="play-add.svg" + sodipodi:docname="play.svg" inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -28,7 +28,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="17.921875" - inkscape:cx="4.954364" + inkscape:cx="-5.3403178" inkscape:cy="10.148736" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -54,7 +54,7 @@ image/svg+xml - + @@ -64,7 +64,7 @@ id="layer1" transform="translate(0,-1036.3622)"> + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/actions/rename.png b/core/img/actions/rename.png index 9a86919df5a..9993a092df1 100644 Binary files a/core/img/actions/rename.png and b/core/img/actions/rename.png differ diff --git a/core/img/actions/rename.svg b/core/img/actions/rename.svg index adda394ddf9..44b464c850f 100644 --- a/core/img/actions/rename.svg +++ b/core/img/actions/rename.svg @@ -14,7 +14,7 @@ id="svg3875" version="1.1" inkscape:version="0.48.1 r9760" - sodipodi:docname="drawing.svg" + sodipodi:docname="rename.svg" inkscape:export-filename="/home/jancborchardt/rename.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -27,9 +27,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="25.345359" - inkscape:cx="10.704484" - inkscape:cy="9.4345147" + inkscape:zoom="8.9609376" + inkscape:cx="13.152158" + inkscape:cy="4.0337477" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -54,7 +54,7 @@ image/svg+xml - + @@ -64,17 +64,9 @@ id="layer1" transform="translate(0,-1036.3622)"> - + id="path3086" /> diff --git a/core/img/actions/share.png b/core/img/actions/share.png index 300ce57544d..62c4627f317 100644 Binary files a/core/img/actions/share.png and b/core/img/actions/share.png differ diff --git a/core/img/actions/share.svg b/core/img/actions/share.svg index 7812971e387..a5f2f8cb4d2 100644 --- a/core/img/actions/share.svg +++ b/core/img/actions/share.svg @@ -14,7 +14,7 @@ id="svg2" version="1.1" inkscape:version="0.48.1 r9760" - sodipodi:docname="New document 1"> + sodipodi:docname="share.svg"> image/svg+xml - + @@ -62,7 +62,7 @@ id="layer1" transform="translate(0,-1036.3622)"> diff --git a/core/img/actions/shared.png b/core/img/actions/shared.png new file mode 100644 index 00000000000..073ff741685 Binary files /dev/null and b/core/img/actions/shared.png differ diff --git a/core/img/actions/shared.svg b/core/img/actions/shared.svg new file mode 100644 index 00000000000..2302cc98919 --- /dev/null +++ b/core/img/actions/shared.svg @@ -0,0 +1,1738 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/places/world.png b/core/img/places/world.png deleted file mode 100644 index b89aa3176b0..00000000000 Binary files a/core/img/places/world.png and /dev/null differ diff --git a/core/img/places/world.svg b/core/img/places/world.svg deleted file mode 100644 index 846e32f68e3..00000000000 --- a/core/img/places/world.svg +++ /dev/null @@ -1,300 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/files/css/files.css b/files/css/files.css index e0282d2ce05..319cbf0c87a 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -57,7 +57,6 @@ table thead.fixed {height:2em} #uploadsize-message,#delete-confirm { display:none; } .selectedActions a, a.file_action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; } .selectedActions { display:none; } -.selectedActions a:hover, a.file_action:hover { background:#fff; -moz-box-shadow:0 0 10px #fff; -webkit-box-shadow:0 0 10px #fff; box-shadow:0 0 10px #fff; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } /* add breadcrumb divider to the File item in navigation panel */ #navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; } -- cgit v1.2.3