From 34105d0f28be53ff106ed017eda0f9a03385bbea Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Fri, 13 Jun 2014 02:45:05 +0200 Subject: [PATCH] Remove some favicons. --- src/_h5ai/client/images/favicon/app-114.png | Bin 656 -> 0 bytes src/_h5ai/client/images/favicon/app-144.png | Bin 713 -> 0 bytes src/_h5ai/client/images/favicon/app-152.png | Bin 0 -> 800 bytes src/_h5ai/client/images/favicon/app-16-32.ico | Bin 0 -> 5430 bytes src/_h5ai/client/images/favicon/app-16.ico | Bin 1150 -> 0 bytes src/_h5ai/client/images/favicon/app-48.png | Bin 353 -> 0 bytes src/_h5ai/client/images/favicon/app-57.png | Bin 432 -> 0 bytes src/_h5ai/client/images/favicon/app-72.png | Bin 492 -> 0 bytes src/_h5ai/client/images/favicon/app.svg | 9 ++++--- src/_h5ai/client/js/inc/core/location.js | 2 +- src/_h5ai/client/js/inc/model/item.js | 10 +++++-- src/_h5ai/conf/options.json | 2 +- src/_h5ai/index.html.jade | 8 ++---- src/_h5ai/server/php/inc/class-app.php | 25 ++++++++++++++++++ src/_h5ai/server/php/inc/class-item.php | 15 +++++++++++ src/_h5ai/server/php/inc/page.php.jade | 8 ++---- 16 files changed, 60 insertions(+), 19 deletions(-) delete mode 100644 src/_h5ai/client/images/favicon/app-114.png delete mode 100644 src/_h5ai/client/images/favicon/app-144.png create mode 100644 src/_h5ai/client/images/favicon/app-152.png create mode 100644 src/_h5ai/client/images/favicon/app-16-32.ico delete mode 100644 src/_h5ai/client/images/favicon/app-16.ico delete mode 100644 src/_h5ai/client/images/favicon/app-48.png delete mode 100644 src/_h5ai/client/images/favicon/app-57.png delete mode 100644 src/_h5ai/client/images/favicon/app-72.png diff --git a/src/_h5ai/client/images/favicon/app-114.png b/src/_h5ai/client/images/favicon/app-114.png deleted file mode 100644 index 6de58eaa575e7d513600a42d27a548e22570035d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 656 zcmeAS@N?(olHy`uVBq!ia0vp^MIg+<1|<9Mw$=hEmSQK*5Dp-y;YjHK@;M7UB8wRq zlIDRhW9i10MxdZ%iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xWAVndW zB{``K?s@sSsS3fBxk>psnaK*C$@zH-AsMN;seMZ{S2Hj$KJs*N45^s&_U1<4!wxcT zANMJl$w^3P(u4`qlKD)1i{%CL1q-WhT1Hm+YVLg^XSg-%h4m-)kIG8# z{-p-an-}c0`i}B4lNVX7N^UMTroNj`*(Q0VJ2wgb?mA|}UBuQ=do*cY%N)U^_=z*> zoz4ktTyJq^@dRVHH`-jE!#xDIi#As>Xg+duO?cU zipo$E%9Iq0-|2qi3(%`Y`5U;OT;)Q3IME diff --git a/src/_h5ai/client/images/favicon/app-144.png b/src/_h5ai/client/images/favicon/app-144.png deleted file mode 100644 index ecd9a74f217ac2953ff48eba82a09c589b9c1f85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 713 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$a>cu@pObhHwBu4M$1`kk47*5n0T@ zP%{aH8T;oa$pZx?OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpe1`2Pq24 zEXhe_aL>!nO;rf4%uUMA$xK%8OwP|!2+2szP3>Evxtf82N!ruJF{EP7+uIj&r5r^Z zE*|tt%uLEWzC<=dDfGg*U+P^cHwzoO_a=Rx!!&Q6TliZJGT}nb79_>7(rnJjK;p3f@uY$266DlT! zx_`M3lonsz`{FW?4qx5#Vm?rt_Zq!L{6J%-M}@k)XA(NUJ;K)|A4EsFy3_;3mE`Oe zEjK)}c|&{Oi=Q=i@@*B2RO6Xo1=0Z2m ne%|wi&&I$U6n&_Etz@+}58Z8Ndj1VCMKO4~`njxgN@xNA#ysqN diff --git a/src/_h5ai/client/images/favicon/app-152.png b/src/_h5ai/client/images/favicon/app-152.png new file mode 100644 index 0000000000000000000000000000000000000000..3f8e9fa5ffd7042d7668810ea5719516a00f77a7 GIT binary patch literal 800 zcmeAS@N?(olHy`uVBq!ia0vp^GeDSw4M<8HQcwg^EX7WqAsj$Z!;#Vf4nJ zG}nSK9gP2NC6eegA|2i zmgJ-|xaZ~PrYZzi<|gImWF{+kCg69igRw&l;8X}P>1{{AB`f2mBf_QQz|PqV%; zO!G}x!s6zIOsqR!nz8-%-5$ezb6(%8f0w!ce*J9QM?yL0KC1ptkKs@5=~tJJ?%Vyh zuHL%(NRGPw#79-vuHVfo2lH6f)`_pR+q9Tj`1VCpO~4UF5k`{I5IW5CgnVv+Pd=1FHZcEnz7^F z-6ZAT$_9nLn@^mmF?Cu*u uo$JpEEY93J&{V19$=NgIfCn;hg+G2mg7?C(IqATJ%HZkh=d#Wzp$P!LM6(T)FTp_lACE^(vBNH$O9V@T}Et@>fu~LROang{p^!(z}v)^-a zKFI-ASfeOF?{M1!CjidH@q_rC*qIm~84+^!?=N*<5*2IHDNo zs5l@Fhy&t)I3Ny)1LA-<@E;uLyW@@d&O`5oQ`RsvcYCjzqK2`#r>G$}cU!{(J+~bG T7|h)^R%2%`9PER#$r-vYEiUpH literal 0 HcmV?d00001 diff --git a/src/_h5ai/client/images/favicon/app-16.ico b/src/_h5ai/client/images/favicon/app-16.ico deleted file mode 100644 index 63ead9eb9a2ac096250131bb1396fad10a3854b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x$A1^@s5XP^X!hKBwh#iL;`Qqw?K nSXcuweg~<;mCp#7fln_kGl>_+S}foflxJXQux9|48w?Bpe4H*D diff --git a/src/_h5ai/client/images/favicon/app-48.png b/src/_h5ai/client/images/favicon/app-48.png deleted file mode 100644 index bf477170418a9320f06780ee139d54f66ca1773f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq zG}}O!QR&V79-yFPiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xWAVndW zB{``K?s@sSsS3fBxk>psnaK*C$@zH-AsMN;seMZ{R|A!9_H=O!$!L6gYa{O=1A*3u zyALGj6z(caI=1nN;*CR(W3-e7LJB@kUiy8i=A7@^t+O*+PMk9P(onA}U-0+ag}dG^ zZ*J-bU#(udHD%tGkfM;x zlAKfq_q_bvRE6Nm+@$=R%wz@6R5M9f3^NzJZa?aVD=|M$%1vHnQPn2*wFIo0_Zja$MhJ6fsD*5b9ua*A2_xkX@Se@Rkc$XS;8>)o!r*QO7cESWbv;j&duXPI_qf#?Q~gp;gUiY-eS{(ryHKe1Jy zZi7xjCd-G!wEF&eD-IepGHhThs5rK*SkzihF;ZxfDk;QLwdZ^0R}0>|`=@y3+EANy cs~zMRbKiIvhi>|)2@E&}Pgg&ebxsLQ0P{ehRR910 diff --git a/src/_h5ai/client/images/favicon/app-72.png b/src/_h5ai/client/images/favicon/app-72.png deleted file mode 100644 index 1e893f8bcdb2857d136d6101738697c925f93534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 492 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!EX7WqAsj$Z!;#Vf4nJ z*m;65qp8CBn?OOy64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U#L5e~$ zOL9^f-1G8tQx$?MbCdFOGLscNlk@WwLNZcwQ~Q=^u4Z6hwDWXv45^s&_Riki<^Tz| zhvMzFj{-NbZ1*+m+}nBikkGuQS-u{^i(EMEMC&hEn(n&4+ z%pt_F>SbflDa(_$AI&~vz9qN%c2>pL7pi|-i~T?Cxnx%ydwbj79K(ulU2i$mJ@0vI zPS<7o&%MQX&Pv}2{}|qiq-T{biFdF*J~K-6rSuC0i{RCYb0-~s=(D!z%a!kcEsr0b zS@m+)x~y5x_FZXMl{riC_>rGC-6th>HoumUSNDvYZgnHy&_jV9aD`vd-KtL8?;pNf iJQF?4(!|na$9Qq3`Sb_74(|g7I)kUHpUXO@geCyy+q3xq diff --git a/src/_h5ai/client/images/favicon/app.svg b/src/_h5ai/client/images/favicon/app.svg index f9f62db9..a2faca00 100644 --- a/src/_h5ai/client/images/favicon/app.svg +++ b/src/_h5ai/client/images/favicon/app.svg @@ -14,7 +14,10 @@ width="16" version="1.1" inkscape:version="0.48.4 r9939" - sodipodi:docname="folder.svg"> + sodipodi:docname="app.svg" + inkscape:export-filename="/home/lars/env/workspace/h5ai/src/_h5ai/client/images/favicon/app-32.png" + inkscape:export-xdpi="180" + inkscape:export-ydpi="180"> get_all_items(); + // return json_decode(file_get_contents(CACHE_PATH . "/item.json")); + $cache = array(); $folder = Item::get($this, $this->to_path($url), $cache); @@ -197,12 +200,34 @@ class App { } + public function cummulate_folders($item, &$cache) { + + if (!$item->is_folder) { + return; + } + + $max_date = $item->date; + $sum_size = 0; + foreach ($item->get_content($cache) as $child) { + $this->cummulate_folders($child, $cache); + if ($child->date > $max_date) { + $max_date = $child->date; + } + $sum_size += $child->size; + } + + $item->date = $max_date; + $item->size = $sum_size; + } + + public function get_all_items() { $cache = array(); $root = Item::get($this, ROOT_PATH, $cache); $this->get_all_item_content($root, $cache); + $this->cummulate_folders($root, $cache); uasort($cache, array("Item", "cmp")); $result = array(); diff --git a/src/_h5ai/server/php/inc/class-item.php b/src/_h5ai/server/php/inc/class-item.php index 482669fd..1d5674d9 100644 --- a/src/_h5ai/server/php/inc/class-item.php +++ b/src/_h5ai/server/php/inc/class-item.php @@ -87,6 +87,18 @@ class Item { $this->date = @filemtime($this->path); $this->size = Item::filesize($app, $this->path); $this->is_content_fetched = false; + + // $options = $app->get_options(); + // if (!$this->is_folder && $options["hashes"]["enabled"]) { + if (!$this->is_folder) { + // $this->md5 = md5_file($this->path); + // $this->sha1 = sha1_file($this->path); + $this->md5 = null; + $this->sha1 = null; + } else { + $this->md5 = null; + $this->sha1 = null; + } } @@ -101,6 +113,9 @@ class Item { if ($this->is_folder) { $obj["is_managed"] = $this->app->is_managed_url($this->url); $obj["content"] = $this->is_content_fetched; + } else { + $obj["md5"] = $this->md5; + $obj["sha1"] = $this->sha1; } return $obj; diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade index d32a0f71..21d99faf 100644 --- a/src/_h5ai/server/php/inc/page.php.jade +++ b/src/_h5ai/server/php/inc/page.php.jade @@ -15,12 +15,8 @@ html.no-js.browser( lang="en" ) title index ยท styled with {{pkg.name}} {{pkg.version}} ({{pkg.url}}) meta( name="description", content="index styled with {{pkg.name}} {{pkg.version}} ({{pkg.url}})" ) meta( name="viewport", content="width=device-width" ) - link( rel="shortcut icon", href!="#{app_href}client/images/favicon/app-16.ico" ) - link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/favicon/app-48.png" ) - link( rel="apple-touch-icon-precomposed", sizes="57x57", type="image/png", href!="#{app_href}client/images/favicon/app-57.png" ) - link( rel="apple-touch-icon-precomposed", sizes="72x72", type="image/png", href!="#{app_href}client/images/favicon/app-72.png" ) - link( rel="apple-touch-icon-precomposed", sizes="114x114", type="image/png", href!="#{app_href}client/images/favicon/app-114.png" ) - link( rel="apple-touch-icon-precomposed", sizes="144x144", type="image/png", href!="#{app_href}client/images/favicon/app-144.png" ) + link( rel="shortcut icon", href!="#{app_href}client/images/favicon/app-16-32.ico" ) + link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/favicon/app-152.png" ) link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300italic,700italic,300,700" ) link( rel="stylesheet", href!="#{app_href}client/css/styles.css" ) script( src!="#{app_href}client/js/scripts.js" )