From 7af8c6c3cbf00444b81a6d3d0c4cede983ff8edc Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 28 Oct 2012 16:05:31 +0100 Subject: [PATCH] first version of breadcrumb 'root', still have a weird feeling about this --- apps/files/appinfo/app.php | 2 +- apps/files/css/files.css | 4 - apps/files/templates/part.breadcrumb.php | 11 +- core/css/styles.css | 5 +- core/img/places/files.png | Bin 0 -> 372 bytes core/img/places/files.svg | 1779 ++++++++++++++++++++++ core/img/places/home.png | Bin 372 -> 364 bytes core/img/places/home.svg | 83 +- 8 files changed, 1853 insertions(+), 31 deletions(-) create mode 100644 core/img/places/files.png create mode 100644 core/img/places/files.svg diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index b431ddfec02..3f437679e05 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -3,6 +3,6 @@ $l=OC_L10N::get('files'); OCP\App::registerAdmin('files', 'admin'); -OCP\App::addNavigationEntry( array( "id" => "files_index", "order" => 0, "href" => OCP\Util::linkTo( "files", "index.php" ), "icon" => OCP\Util::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") )); +OCP\App::addNavigationEntry( array( "id" => "files_index", "order" => 0, "href" => OCP\Util::linkTo( "files", "index.php" ), "icon" => OCP\Util::imagePath( "core", "places/files.svg" ), "name" => $l->t("Files") )); OC_Search::registerProvider('OC_Search_Provider_File'); diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 0b886fc3fa9..64e49d687d3 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -81,10 +81,6 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } .selectedActions a { display:inline; margin:-.5em 0; padding:.5em !important; } .selectedActions a img { position:relative; top:.3em; } -/* add breadcrumb divider to the File item in navigation panel */ -#navigation>ul>li:first-child { background:url('%webroot%/core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; } -#navigation>ul>li:first-child+li { padding-top:2.9em; } #scanning-message{ top:40%; left:40%; position:absolute; display:none; } -div.crumb a{ padding: 0.9em 0 0.7em 0; } diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php index 71b695f65f8..37b6b63eabd 100644 --- a/apps/files/templates/part.breadcrumb.php +++ b/apps/files/templates/part.breadcrumb.php @@ -1,6 +1,13 @@ + +
+ + + +
+ -
svg" data-dir='' style='background-image:url("")'> - "> +
svg" data-dir=''> +
diff --git a/core/css/styles.css b/core/css/styles.css index 95dceb50dec..0dbba19742c 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -177,6 +177,7 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd .arrow.down { -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -o-transform: rotate(180deg); -ms-transform: rotate(180deg); transform: rotate(180deg); } /* ---- BREADCRUMB ---- */ -div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; } +div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; } div.crumb:first-child { padding-left:1em; } -div.crumb.last { font-weight:bold; } +div.crumb.last { font-weight:bold; background:none; padding-right:0; } +div.crumb a{ padding: 0.9em 0 0.7em 0; } diff --git a/core/img/places/files.png b/core/img/places/files.png new file mode 100644 index 0000000000000000000000000000000000000000..c3dbd3e35386f938b7e8928a0f90ec4660eb88a5 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4XK2Qi{56`sSx;f&^RV;~8eY%-?4$ ztK7jEG0k<7%EH{+O&un_`Z`AcSY(b@p5OH5PN}So()rKbxwqvn*_`)3Q`jiLB>1|P z?Jm#8_tgRi|F$MdIIx&E7_tf8VNhgoDPVqV(ZrFLV0<_Bw)uUdU!0PLtIsL|JgTe~DWM4fyC09M literal 0 HcmV?d00001 diff --git a/core/img/places/files.svg b/core/img/places/files.svg new file mode 100644 index 00000000000..4b45ef12bcb --- /dev/null +++ b/core/img/places/files.svg @@ -0,0 +1,1779 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/places/home.png b/core/img/places/home.png index c3dbd3e35386f938b7e8928a0f90ec4660eb88a5..5cbf1114cb7c3300ebcc14c9ba75243e31a361ef 100644 GIT binary patch delta 262 zcmV+h0r~#)0_*~iZhz@XL_t(Ijm48aYQ!)Qh2Q+hm5;E2T}TtuPUR!y3Sn_>lWU~O z4ML9KN`0EZ7ReD@O4e3dvXN~94n!ar!F%7lkr0Itux0TkHvla~*L8P9^q6zLT{95T zN6z_q7>4(&1gd&u=7Wf&wav^2RXtV-n0XH%j^p?cLdbL7&3}yAwtWGxzxYbwoQux6 zxMT)^5JE1xDuJq|wb_?+-vP0f&jPM=e+OXZUjcsVHs8VJ6+|S8NHjBAGMgC{U6sH& zcLH$Zy?^Taeiq=p2Y?9RvjQ|t^O{n+XXf472-7ruiO5?y)4%`5GbiXwY2s`-1^@s6 M07*qoM6N<$f_b!jP5=M^ delta 271 zcmV+q0r39p0`vlqZh!GfL_t(I%caplYJ@NpfMG!p1Xm)uQB)9I2!fz)L>D41q(O>p zno^m2%{h99GMVuZ^G;%8L2#gPGVS7nge3psMVh8b`j6d1S(aaz=RXD5!&lGqPOj^o z*cvH{^0~SjP*oKNK|qV5fQ9e-U+a3Y8_+Zjhha#os)AKnmVejno*U40{Vj?jTGut~ z`88k|28rXCHcbQfn5KES30Rgzk|d#R+k%KRO)o4m{sbJydC#)!+;ts1BG2=SZQCEx zJkL+eae)v55$k;h-3+nsdl13>g<%*#1UG;&1`*rD%PDHLkV1kzyc|HID diff --git a/core/img/places/home.svg b/core/img/places/home.svg index 4b45ef12bcb..c56f9661282 100644 --- a/core/img/places/home.svg +++ b/core/img/places/home.svg @@ -14,9 +14,9 @@ width="16" height="16" id="svg11300" - inkscape:version="0.48.1 r9760" - sodipodi:docname="help.svg" - inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/help.png" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="home.svg" + inkscape:export-filename="home.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + + + + + + + - - - - + +