From 70b7de39a751934056ca5744ae4327d94b4a80f9 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Tue, 28 Jul 2015 17:20:40 +0200 Subject: [PATCH 1/6] Upload/Browse popup for files and images Jot buttons to upload images and files show a popup, where the user can select a previously uploaded item o upload a new one --- mod/fbrowser.php | 37 ++++++++---- view/global.css | 18 +++++- view/templates/filebrowser.tpl | 7 ++- view/templates/filebrowser_plain.tpl | 86 ++++++++++++++++++++++++++++ view/templates/jot-header.tpl | 77 +++++++++++++++++-------- view/theme/duepuntozero/style.css | 3 + view/theme/quattro/dark/style.css | 67 ++++++++++++++++++++++ view/theme/quattro/green/style.css | 67 ++++++++++++++++++++++ view/theme/quattro/lilac/style.css | 67 ++++++++++++++++++++++ view/theme/quattro/quattro.less | 25 ++++++++ view/theme/vier/style.css | 6 ++ 11 files changed, 422 insertions(+), 38 deletions(-) create mode 100644 view/templates/filebrowser_plain.tpl diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 075846e50..bf6842faf 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -18,11 +18,18 @@ function fbrowser_content($a){ if ($a->argc==1) killme(); + $template_file = "filebrowser.tpl"; + $mode = ""; + if (x($_GET,'mode')) { + $template_file = "filebrowser_plain.tpl"; + $mode = "?mode=".$_GET['mode']; + } + //echo "
"; var_dump($a->argv); killme();	
 	
 	switch($a->argv[1]){
 		case "image":
-			$path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")));
+			$path = array( array($a->get_baseurl()."/fbrowser/image/".$mode, t("Photos")));
 			$albums = false;
 			$sql_extra = "";
 			$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
@@ -32,8 +39,8 @@ function fbrowser_content($a){
 					intval(local_user())
 				);
 				// anon functions only from 5.3.0... meglio tardi che mai..
-				function folder1($el){return array(bin2hex($el['album']),$el['album']);}	
-				$albums = array_map( "folder1" , $albums);
+				$folder1 = function($el) use ($mode) {return array(bin2hex($el['album']).$mode,$el['album']);};
+				$albums = array_map( $folder1 , $albums);
 				
 			}
 			
@@ -42,7 +49,7 @@ function fbrowser_content($a){
 				$album = hex2bin($a->argv[2]);
 				$sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
 				$sql_extra2 = "";
-				$path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album);
+				$path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/".$mode, $album);
 			}
 				
 			$r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  
@@ -71,14 +78,16 @@ function fbrowser_content($a){
 			}
 			$files = array_map("files1", $r);
 			
-			$tpl = get_markup_template("filebrowser.tpl");
-			echo replace_macros($tpl, array(
+			$tpl = get_markup_template($template_file);
+			
+			$o =  replace_macros($tpl, array(
 				'$type' => 'image',
 				'$baseurl' => $a->get_baseurl(),
 				'$path' => $path,
 				'$folders' => $albums,
 				'$files' =>$files,
 				'$cancel' => t('Cancel'),
+				'$nickname' => $a->user['nickname'],
 			));
 				
 				
@@ -106,14 +115,15 @@ function fbrowser_content($a){
 				//echo "
"; var_dump($files); killme();
 			
 							
-				$tpl = get_markup_template("filebrowser.tpl");
-				echo replace_macros($tpl, array(
+				$tpl = get_markup_template($template_file);
+				$o = replace_macros($tpl, array(
 					'$type' => 'file',
 					'$baseurl' => $a->get_baseurl(),
-					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
+					'$path' => array( array($a->get_baseurl()."/fbrowser/file/", t("Files")) ),
 					'$folders' => false,
 					'$files' =>$files,
 					'$cancel' => t('Cancel'),
+					'$nickname' => $a->user['nickname'],
 				));
 				
 			}
@@ -121,7 +131,12 @@ function fbrowser_content($a){
 			break;
 	}
 	
-
-	killme();
+	if (x($_GET,'mode')) {
+		return $o;
+	} else {
+		echo $o;
+		killme();
+	}
+	
 	
 }
diff --git a/view/global.css b/view/global.css
index 9bcd30229..dd41b9935 100644
--- a/view/global.css
+++ b/view/global.css
@@ -176,4 +176,20 @@ span.oembed, h4 {
 }
 
 /* notifications unseen */
-.notify-unseen { background-color: #cceeFF; }
\ No newline at end of file
+.notify-unseen { background-color: #cceeFF; }
+
+
+/* plain text editor upload/select popup */
+
+.fbrowser .path a { padding: 5px; }
+.fbrowser .path a:before { content: "/"; padding-right: 5px;}
+.fbrowser .folders ul { list-style-type: none; padding-left: 10px;}
+.fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; }
+.fbrowser.image .photo-album-image-wrapper { float: left; }
+.fbrowser.image a img { height: 48px; }
+.fbrowser.image a p { display: none;}
+.fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; }
+.fbrowser.file img { display: inline; }
+.fbrowser.file p  { display: inline; white-space: nowrap; }
+
+.fbrowser .upload { clear: both; padding-top: 1em;}
\ No newline at end of file
diff --git a/view/templates/filebrowser.tpl b/view/templates/filebrowser.tpl
index b207277a7..2122e27fc 100644
--- a/view/templates/filebrowser.tpl
+++ b/view/templates/filebrowser.tpl
@@ -1,6 +1,9 @@
-
 
 
+