From 573d36a168e6bf60a49468024dca43f2cf9eb448 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 18 Apr 2011 09:42:20 +0200 Subject: [PATCH 01/12] one / in filepaths is enough --- files/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/files/index.php b/files/index.php index 2a78e8a438e..7ac3bce6051 100644 --- a/files/index.php +++ b/files/index.php @@ -42,6 +42,9 @@ $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; $files = array(); foreach( OC_FILES::getdirectorycontent( $dir ) as $i ){ $i["date"] = OC_UTIL::formatDate($i["mtime"] ); + if($i['directory']=='/'){ + $i['directory']=''; + } $files[] = $i; } From 03747a0ffbb177de43db306f43e2896eb9cf740f Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 18 Apr 2011 10:02:01 +0200 Subject: [PATCH 02/12] implemented Delete action in file menu --- files/js/files.js | 39 +++++++++++++++++++++++++++++++-------- files/templates/index.php | 2 +- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/files/js/files.js b/files/js/files.js index 5c11bddeb56..019758dc497 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -39,6 +39,19 @@ $(document).ready(function() { $('.browser input:checkbox').attr('checked', false); }); + // Delete current file + $('#delete_single_file').click(function() { + filename = $('#file_menu').parents('tr:first').find('.filename:first').children('a:first').text(); + $.ajax({ + url: 'ajax/delete.php', + data: "dir="+$('#dir').val()+"&file="+filename, + complete: function(data){ + boolOperationFinished(data, true, $('#file_menu').parents('tr:first')); + } + }); + return false; + }); + $('#file_upload_start').click(function() { $('#file_upload_target').load(uploadFinished); }); @@ -47,7 +60,7 @@ $(document).ready(function() { $.ajax({ url: 'ajax/newfolder.php', data: "dir="+$('#dir').val()+"&foldername="+$('#file_new_dir_name').val(), - complete: boolOpFinished + complete: function(data){boolOperationFinished(data, false);} }); }); @@ -98,14 +111,20 @@ function resetFileActionPanel() { $('#file_action_panel').attr('activeAction', false); } -function boolOpFinished(data) { +function boolOperationFinished(data, single, el) { result = eval("("+data.responseText+");"); if(result.status == 'success'){ - $.ajax({ - url: 'ajax/list.php', - data: "dir="+$('#dir').val(), - complete: refreshContents - }); + if(single) { + $('#file_menu').slideToggle(0); + $('body').append($('#file_menu')); + $(el).remove(); + } else { + $.ajax({ + url: 'ajax/list.php', + data: "dir="+$('#dir').val(), + complete: refreshContents + }); + } } else { alert(result.data.message); } @@ -117,7 +136,11 @@ function refreshContents(data) { updateBreadcrumb(result.data.breadcrumb); } updateFileList(result.data.files); - $('#file_upload_button').click(); + $('td.fileaction a').click(function() { + $(this).parent().append($('#file_menu')); + $('#file_menu').slideToggle(250); + return false; + }); resetFileActionPanel(); } diff --git a/files/templates/index.php b/files/templates/index.php index 75eef0d16e4..d38e771c2e1 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -40,6 +40,6 @@ name="file_upload_target" src=""> From 944a05b5887174d401481f39c771473d32f4e430 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 18 Apr 2011 10:09:11 +0200 Subject: [PATCH 03/12] convert special chars to entities --- files/templates/part.list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/part.list.php b/files/templates/part.list.php index 76d938326b6..1c30d5a3311 100644 --- a/files/templates/part.list.php +++ b/files/templates/part.list.php @@ -1,7 +1,7 @@ - )" href="" title=""> + )" href="" title=""> + From d377a1518d43abb6a4bf8734d08aba258908b846 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 18 Apr 2011 10:10:17 +0200 Subject: [PATCH 04/12] also convert special chars to entities in the breadcrumb --- files/templates/part.breadcrumb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/part.breadcrumb.php b/files/templates/part.breadcrumb.php index 4d11edb984a..da9544008b9 100644 --- a/files/templates/part.breadcrumb.php +++ b/files/templates/part.breadcrumb.php @@ -1,4 +1,4 @@ ">" alt="Root" /> - "> + "> \ No newline at end of file From 8a7f2361d501683a88c5f687d15c4670da589a78 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 18 Apr 2011 10:19:50 +0200 Subject: [PATCH 05/12] public link sharing also works for folders now --- plugins/publiclink/get.php | 76 +++++++++++++++++++++ plugins/publiclink/getfile.php | 11 --- plugins/publiclink/lib_public.php | 23 ++----- plugins/publiclink/templates/breadcrumb.php | 4 ++ plugins/publiclink/templates/files.php | 9 +++ plugins/publiclink/templates/index.php | 17 +++++ 6 files changed, 110 insertions(+), 30 deletions(-) create mode 100644 plugins/publiclink/get.php delete mode 100644 plugins/publiclink/getfile.php create mode 100644 plugins/publiclink/templates/breadcrumb.php create mode 100644 plugins/publiclink/templates/files.php create mode 100644 plugins/publiclink/templates/index.php diff --git a/plugins/publiclink/get.php b/plugins/publiclink/get.php new file mode 100644 index 00000000000..cdfe42ef262 --- /dev/null +++ b/plugins/publiclink/get.php @@ -0,0 +1,76 @@ + $pathtohere, "name" => $i ); + } + } + + $breadcrumbNav = new OC_TEMPLATE( "plugins/publiclink", "breadcrumb", "" ); + $breadcrumbNav->assign( "breadcrumb", $breadcrumb ); + $breadcrumbNav->assign('token',$token); + + $list = new OC_TEMPLATE( 'plugins/publiclink', 'files', '' ); + $list->assign( 'files', $files ); + $list->assign('token',$token); + + $tmpl = new OC_TEMPLATE( 'plugins/publiclink', 'index', 'user' ); + $tmpl->assign('fileList', $list->fetchPage()); + $tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() ); + $tmpl->printPage(); + }else{ + //get time mimetype and set the headers + $mimetype=OC_FILESYSTEM::getMimeType($path); + header('Content-Transfer-Encoding: binary'); + header('Content-Disposition: attachment; filename="'.basename($path).'"'); + header('Expires: 0'); + header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); + header('Pragma: public'); + header('Content-Type: ' . $mimetype); + header('Content-Length: ' . OC_FILESYSTEM::filesize($path)); + + //download the file + ob_clean(); + OC_FILESYSTEM::readfile($path); + } +}else{ + header("HTTP/1.0 404 Not Found"); + echo '404 Not Found'; + die(); +} +?> \ No newline at end of file diff --git a/plugins/publiclink/getfile.php b/plugins/publiclink/getfile.php deleted file mode 100644 index 15a568df3dc..00000000000 --- a/plugins/publiclink/getfile.php +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/plugins/publiclink/lib_public.php b/plugins/publiclink/lib_public.php index 7c25c938fda..436dddeef22 100644 --- a/plugins/publiclink/lib_public.php +++ b/plugins/publiclink/lib_public.php @@ -22,10 +22,9 @@ class OC_PublicLink{ } /** - * download a file shared by a public link - * @param string token + * get the path of that shared file */ - public static function downloadFile($token){ + public static function getPath($token){ //remove expired links $query=OC_DB::prepare("DELETE FROM *PREFIX*publiclink WHERE expire_time < NOW() AND expire_time!=0"); $query->execute(); @@ -41,23 +40,9 @@ class OC_PublicLink{ //prepare the filesystem OC_UTIL::setupFS($user); - //get time mimetype and set the headers - $mimetype=OC_FILESYSTEM::getMimeType($path); - // header('Content-Disposition: attachment; filename="'.basename($path).'"'); - header('Content-Transfer-Encoding: binary'); - header('Expires: 0'); - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Pragma: public'); - header('Content-Type: ' . $mimetype); - header('Content-Length: ' . OC_FILESYSTEM::filesize($path)); - - //download the file - ob_clean(); - OC_FILESYSTEM::readfile($path); + return $path; }else{ - header("HTTP/1.0 404 Not Found"); - echo '404 Not Found'; - die(); + return false; } } diff --git a/plugins/publiclink/templates/breadcrumb.php b/plugins/publiclink/templates/breadcrumb.php new file mode 100644 index 00000000000..3f4ae863ee0 --- /dev/null +++ b/plugins/publiclink/templates/breadcrumb.php @@ -0,0 +1,4 @@ + " alt="Root" /> + + "> + \ No newline at end of file diff --git a/plugins/publiclink/templates/files.php b/plugins/publiclink/templates/files.php new file mode 100644 index 00000000000..6473ad4c5c8 --- /dev/null +++ b/plugins/publiclink/templates/files.php @@ -0,0 +1,9 @@ + + + + )" href="" title=""> + + + + + + \ No newline at end of file diff --git a/plugins/publiclink/templates/index.php b/plugins/publiclink/templates/index.php new file mode 100644 index 00000000000..9e238452603 --- /dev/null +++ b/plugins/publiclink/templates/index.php @@ -0,0 +1,17 @@ +

+ +

+ + + + + + + + + + + + + +
NameSizeModified
\ No newline at end of file From 743896010932e1ef2d2d1db898d4365f65116c3c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 18 Apr 2011 10:31:20 +0200 Subject: [PATCH 06/12] use better tokens for public links --- plugins/publiclink/lib_public.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/publiclink/lib_public.php b/plugins/publiclink/lib_public.php index 436dddeef22..20b538d3ac9 100644 --- a/plugins/publiclink/lib_public.php +++ b/plugins/publiclink/lib_public.php @@ -6,9 +6,9 @@ class OC_PublicLink{ * @param int (optional) expiretime time the link expires, as timestamp */ public function __construct($path,$expiretime=0){ - if($path && OC_FILESYSTEM::file_exists($path)){ - $token=sha1("$path-$expiretime"); + if($path and OC_FILESYSTEM::file_exists($path) and OC_FILESYSTEM::is_readable($path)){ $user=$_SESSION['user_id']; + $token=sha1("$user-$path-$expiretime"); $query=OC_DB::prepare("INSERT INTO *PREFIX*publiclink VALUES(?,?,?,?)"); $result=$query->execute(array($token,$path,$user,$expiretime)); if( PEAR::isError($result)) { From bba07fdb26fc6502f28f06941eb53980650ccb0d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 18 Apr 2011 10:50:12 +0200 Subject: [PATCH 07/12] show modified date for folders --- files/templates/part.list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/part.list.php b/files/templates/part.list.php index 1c30d5a3311..0d4fcc75489 100644 --- a/files/templates/part.list.php +++ b/files/templates/part.list.php @@ -3,7 +3,7 @@ )" href="" title=""> - + + \ No newline at end of file From 1f514a1afa55ad98d09028eb50210932006b4012 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 18 Apr 2011 10:51:38 +0200 Subject: [PATCH 08/12] add kdevelop project files to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 71e3ec1baf9..9cfb7a5861e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ _darcs/* CVS/* .svn/* RCS/* +.kdev +*.kdev4 From 4e5fe303a1f1906d34f5e303408e96236dfcc41b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 18 Apr 2011 11:02:06 +0200 Subject: [PATCH 09/12] only show selection checkboxes for files on hover --- css/styles.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/css/styles.css b/css/styles.css index f0832d05947..d5b5f59f70c 100644 --- a/css/styles.css +++ b/css/styles.css @@ -99,6 +99,9 @@ table td.download { background-image:url('../img/download.png'); } table td.upload { background-image:url('../img/upload.png'); } table td.create { background-image:url('../img/folder-new.png'); } table td.delete { background-image:url('../img/delete.png'); } +#fileList tr input[type=checkbox] { display:none; } +#fileList tr input[type=checkbox]:checked { display:inline; } +#fileList tr:hover input[type=checkbox] { display:inline; } /* NAVIGATION BAR */ p.nav { margin:1em 0 0 2em; padding:0.8em; line-height:16px; font-weight:bold; } From 5249f09f70c670dcd7d34cac5c5c2ae617ae739b Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 18 Apr 2011 11:22:35 +0200 Subject: [PATCH 10/12] even shinier icons --- admin/appinfo/app.php | 4 ++-- admin/img/apps.png | Bin 217 -> 216 bytes admin/img/plugins.png | Bin 0 -> 217 bytes admin/img/users.png | Bin 765 -> 741 bytes files/appinfo/app.php | 2 +- files/img/file.png | Bin 0 -> 391 bytes files/img/folder.png | Bin 436 -> 386 bytes files/img/home.png | Bin 0 -> 416 bytes files/img/navicon.png | Bin 397 -> 0 bytes help/img/help.png | Bin 467 -> 483 bytes img/help_about.png | Bin 1538 -> 0 bytes img/mimetypes/application-octet-stream.png | Bin 1854 -> 391 bytes img/places/folder.png | Bin 436 -> 386 bytes img/task-attention.png | Bin 1696 -> 0 bytes settings/img/personal.png | Bin 597 -> 595 bytes 15 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 admin/img/plugins.png create mode 100644 files/img/file.png create mode 100644 files/img/home.png delete mode 100644 files/img/navicon.png delete mode 100644 img/help_about.png delete mode 100644 img/task-attention.png diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php index 04f8caf138c..e87013bd993 100644 --- a/admin/appinfo/app.php +++ b/admin/appinfo/app.php @@ -2,10 +2,10 @@ OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" )); -OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System setting", "icon" => OC_HELPER::imagePath( "admin", "administration.png" ))); +OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" =>"System", "icon" => OC_HELPER::imagePath( "admin", "administration.png" ))); OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "users.png" ))); OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "apps.png" ))); -OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "apps.png" ))); +OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "plugins.png" ))); // Add subentries for App installer OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_installed", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php?add=some¶meters=here" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" ))); diff --git a/admin/img/apps.png b/admin/img/apps.png index 1e6f16651c26da368234185e515f9a189472ae15..ee3e8355e664219251542f04e6e4d5fbecc8859d 100644 GIT binary patch delta 188 zcmcb~c!P0*NwuySyX@1>2iws k)WbZF&uwv`fr~PO*&F?H3qo)418rdNboFyt=akR{0DlKT?EnA( delta 169 zcmV;a09OCl0oehNBo78+OGiWi{{a60|De66laVnPe+P6)O+^RW1Q8K94>QcTTL1t6 zW=TXrR5;7+k+BWHAPfZgD5a-xLGMA>iJh2(nLZT=h*9b&apl)pZ_6LT>kC6)7M2$6 z@}ns;izF+_YG!fWwBy}CL;`>eAdATD)Ez&^0aY!n_Y6GVe?T%%&jBX=#Qzw-9peS# X^g`+C5By|~00000NkvXXu0mjf=UYd| diff --git a/admin/img/plugins.png b/admin/img/plugins.png new file mode 100644 index 0000000000000000000000000000000000000000..1e6f16651c26da368234185e515f9a189472ae15 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjr0pr8f6@tGabK%q2G7sn8b({CqkGA@{ z_l`F@=gw%JX(!6j5%@}@@agr){L}J>UUNIgi%k=I`)RSJakq;0$*i=(yIUULb#P&7 z;8Ey4@%DC&Z0^-N82O)PRQr46zr=po$E=UPIK6!JC#4T)BZH@_pUXO@ GgeCy{8BRF> literal 0 HcmV?d00001 diff --git a/admin/img/users.png b/admin/img/users.png index 0d3701918b92e6a33b1a1f2fcc9a50f05c809523..ea2ed9e3335ea5be11896d705b6afaf92a691695 100644 GIT binary patch delta 642 zcmV-|0)74c1?2^hZhvA)L_t(IjdhbhNE|^F#=qS+-t522dULu#y^}iL8wn>40~fg2mEfB_-Ia-+-cUFL|lsa96cJosRE z%=de5-ea^@tA+oC@B561o+L@~008UtdY=L8v|25d-eFe^j(=rYH}>}SP5{8NtVfn* zE#~ui3xF0y(PXF7836Dx_2}tgYHI4C<2dgaV{eZ$Mh`)Mv!tya4<^$Wnp z#>NNNbweV;!otF)lv1s&t$nK3>lfgOiHW22_4UmxfC0el?Cf14dR!`%IAaXU%gc=@ zihgWwZ-2FITN2Sd0B~LRP)hkd3(&^L$LCGceBn5bZGRYsrRzGn-EKDw!zhm9BiD6r z4Gs<#0U!*+vmgk*5Yf)o*491%Xw7ExJrUi(HF17^{+Eat0Hl*wN~t)G<956Kjfmbb z&iP2zlwDD3zVv3sxNX~9DRn=Jq8u$PEmhj>cCOd!F-_BS0F+(b|CGz+m=J<#Ns?3m zQ~(qJ@O!zrxz}+VyH_h`JIiz!Fe&9Rfa6U56%k!GlD^=aYueS{Sglr{?e6YQ9vmFp z4uW7vDP=09%p^%*7)FP4-YFCcLA_o-nwgn7>;p6!4F+HYKpB7wfCDf9XaE#|KLE}E c`~-0F4-bOJRQ`Ai;s5{u07*qoM6N<$f;0;?1poj5 delta 667 zcmV;M0%ZN=1^oq(Zhv}7L_t(Ijg6B}XcIvc#=qIO(`?gZHd_*H)0QAn$st7#mZqfO zq0kBzL3;2Yc(aGzMS5>R5b>;so;--2iihfEp_-4;R^oOABF?m!R({Q&Mq9E)yHC=_nRVzC?1 zL9^LxRIAk|BO@c%bzSG3vZ~kXwv_T}tyXgZK#PEhi3zUjIwEH>8CEKlOv5m`>nxp4 z_oq@R8F7aJbANMlZxe|`i-kZqjc7v$L}wrl+Uh5fPHf zq`$np{CIwT{wKx$$N~w>Ij-Fg!Uq4t_Sa=!1 z`FwtFadGhlx$+|#m9hZ9^E}tK?XLjd=(_%BYirA9Gcz;K zgCH0>3Lht>ROtJ@=QxflrSuqM4|K+uNkspqJ2Nv)Q<$bHeBbx>_xG>R>guXRM2#>E zL&Gp60DlU@P}ejKf3sm2J(gwlGNn`wKpsFAK;P2R(qyGlIscz6HFN-9ItBow)9Hh3 zHalqB_6Y#&PjEaQ_X~x>$HTwSrEvfkc6WFCDwWEB<2W(T^Ne=8O+tvK5TcdK;TyL2^8=+^!zRy=7|6R002ovPDHLkV1m(~ BIo|*P diff --git a/files/appinfo/app.php b/files/appinfo/app.php index c542f47b24f..bf67812cf38 100644 --- a/files/appinfo/app.php +++ b/files/appinfo/app.php @@ -2,7 +2,7 @@ OC_APP::register( array( "order" => 2, "id" => "files", "name" => "Files" )); -OC_APP::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "navicon.png" ), "name" => "Files" )); +OC_APP::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "home.png" ), "name" => "Files" )); OC_APP::addSettingsPage( array( "id" => "files_administration", "order" => 1, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files", "icon" => OC_HELPER::imagePath( "files", "folder.png" ))); diff --git a/files/img/file.png b/files/img/file.png new file mode 100644 index 0000000000000000000000000000000000000000..4979044889708bf736aefaee7ade0b1f4462600e GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4MZMonH67GG+8|ab8Lx13YGu=b!nynkOZ=yswch>3kh$r7 zK~kZkN$3HU>Q03x?V4rZ=jT6*clP3pJ~FM{=Dhs#%CZu-!v=nrP40SY-q&N=q_bO5 ziA}2av4z&szSPKfx3|^)-E(~D$xS+LE+6*JT2}dRjva*515gQLJeWAJqKb6Mw<&;$TOvz&bZ literal 0 HcmV?d00001 diff --git a/files/img/folder.png b/files/img/folder.png index 3e7a3ba8cfec2e569b9bfa28ecfa43dcd68fbd44..3edbe257a34cf50b5015f427138a67ea4debb5cf 100644 GIT binary patch delta 286 zcmV+(0pb3%1A+sPZGQm&Nkl8b{7>3`(C~*)y=wL?a+zu*k#orR>-2c+S z`3AZ9h6C5)D&~h24hnU->X1%3>S;N}7XlwI`QGoz2O(|SVv866WLdV?T0a<*5OQvs zMlKGB-^wg{vV*yO%*l0K zdsBeX=n1#=5>Wu4l!8(UDdm%?mz)WK@B8m-2^atbL2&81jz>}SxU|vpyvsG9D2gM1 k-Kx>Rmr@F3>lb(a1;oNZVOfIs4gdfE07*qoM6N<$f&qnz1poj5 delta 336 zcmV-W0k8go1GEE>ZGQnVNklF-`+P5CnUAMz>la4r?z!hq0X!_yv|6@&P}C z0B1ym{DFkj0TC}C;Rn2cfCw2|LL$N3X$ioGjf`2*;i|hdGuuM)D#o~v6^Y1WUDqc_ zkdKI3)REW(E;KQ4}}B;qWXKpsJSu zo{S_&0>Etu;Q|0t03n2yh=k?_0FdW-E+R<)0C3LvHGr9=W*h$+V8d^2m8!x>HbIgQ zkz@c#n3?^11xZ!??!jO%825U;29^w1_8`l$V>3&i|7&6!jYjwL`Md={@Y(TXwcG7i ii7}o7==|y4tmh9K=R1(q0j2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4D^C&wKus_izG(gUkDAsdvx3Qs8Ks`q)BTf+6SjHWAmEa*8~M-LIFH z$NpII+QiDcXHiD(?QiEyeBE3mtP5rAzw=B|i7Y<1y=SB6jE)Bu=b~kf`!g&kIA`9o zaqYU-#{yJodVLRA}ga20KOt-^&?%bDsbFDDp2O=oE7UGlRgz>oUxmPhVTU zyW6ykci(EquNv}Vrk1D4`mdR+n@$#zd{LlF8lC49D!~J`}&}8s*^>bP0 Hl+XkKqHLsY literal 0 HcmV?d00001 diff --git a/files/img/navicon.png b/files/img/navicon.png deleted file mode 100644 index 3802c98fc465bce1296799c41db28ba37c0756ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjr0prDl0&&5&`7#J9(JY5_^EKV<-Wb1d>L7?^in#DKL zx=p6-wZE)<&^2R2%#Kg23!L1%j{5FsyIjDyeaTW+%{%HAt*Y6XLQ51TSyU{Y81_5O z?(8|6geM=*y|8S^W{^KFq;|aJWyvh*qmrdptzbjl{8e3j3B+!<)ZtJ}4wOfnN zF;;B6_9<@t>t7Y@L8lH$d|oo;(r)#nG;f#Z`weEFElSgSY~fe;^x{oLx4;mC&zpn1 zI28-DuD$+xy=-^we@2O9uIyaPB@rBr3LJUA_r1TpEw<`Rj70J&70*eEN1Zr4G}qVM z->!r?r*cKdjvX@?ZNeUQn44$rjF6*2UngE=xrUn22 diff --git a/help/img/help.png b/help/img/help.png index aa222ed83b3c9fce78eeb5c459766993756c6f63..487c6e6fd9241ad9f5e106b2989d16771226d937 100644 GIT binary patch delta 382 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 delta 336 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 From 900ece18e787b294aa1c424af543ec14817b2302 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 18 Apr 2011 11:30:56 +0200 Subject: [PATCH 11/12] seperate view and logic for pagenavi --- lib/base.php | 31 ++++++++----------------------- templates/part.pagenavi.php | 31 +++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 templates/part.pagenavi.php diff --git a/lib/base.php b/lib/base.php index ec305250809..352474e1e83 100644 --- a/lib/base.php +++ b/lib/base.php @@ -242,35 +242,20 @@ class OC_UTIL { public static function showPageNavi($pagecount,$page,$url) { $pagelinkcount=8; - $txt=''; if ($pagecount>1) { - $txt.='
'; - - if ($page>'0') { - $txt.='prev  '; - } - $txt.=''; - $pagestart=$page-$pagelinkcount; if($pagestart<0) $pagestart=0; $pagestop=$page+$pagelinkcount; if($pagestop>$pagecount) $pagestop=$pagecount; - if ($pagestart<>0) $txt.='...'; - for ($i=$pagestart; $i < $pagestop;$i++) { - if ($i<>$page) { - $txt.=' '.($i+1).' '; - } else { - $txt.=' '.($i+1).' '; - } - } - if ($pagecount>$pagestop) $txt.='...'; - $txt.=''; - if (($page+1)<$pagecount) { - $txt.='next'; - } - $txt.='
'; + + $tmpl = new OC_TEMPLATE( '', 'part.pagenavi', '' ); + $tmpl->assign('page',$page); + $tmpl->assign('pagecount',$pagecount); + $tmpl->assign('pagestart',$pagestart); + $tmpl->assign('pagestop',$pagestop); + $tmpl->assign('url',$url); + $tmpl->printPage(); } - echo($txt); } diff --git a/templates/part.pagenavi.php b/templates/part.pagenavi.php new file mode 100644 index 00000000000..1bb99b6173b --- /dev/null +++ b/templates/part.pagenavi.php @@ -0,0 +1,31 @@ +
+ + + + + + +
+ 0):?> + prev   + + + 0):?> + ... + + + +   + +   + + + + ... + + + + next + +
+
\ No newline at end of file From b4a74f895efdcc949731abf70c44580461c5c864 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 18 Apr 2011 11:34:06 +0200 Subject: [PATCH 12/12] proper links for next/previous buttons --- templates/part.pagenavi.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/part.pagenavi.php b/templates/part.pagenavi.php index 1bb99b6173b..d48d0cada32 100644 --- a/templates/part.pagenavi.php +++ b/templates/part.pagenavi.php @@ -3,7 +3,7 @@ 0):?> - prev   + prev   @@ -23,7 +23,7 @@ - next + next