Merge pull request #179 from fabrixxm/master

new field_combobox template and some eyecandy to "file as" function

include/text.php

@@ -1300,6 +1300,7 @@ function file_tag_save_file($uid,$item,$file) {
 		$saved = get_pconfig($uid,'system','filetags');
 		if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
 			set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']');
+		info( t('Item filed') );
 	}
 	return true;
 }

mod/filer.php

@@ -16,8 +16,20 @@ function filer_content(&$a) {
 
 	logger('filer: tag ' . $term . ' item ' . $item_id);
 
-	if($item_id && strlen($term))
+	if($item_id && strlen($term)){
+		// file item
 		file_tag_save_file(local_user(),$item_id,$term);
+	} else {
+		// return filer dialog
+		$filetags = get_pconfig(local_user(),'system','filetags');
+		$filetags = explode("][", trim($filetags,"[]"));
+		$tpl = get_markup_template("filer_dialog.tpl");
+		$o = replace_macros($tpl, array(
+			'$field' => array('term', t("File as:"), '', '', $filetags, t('- select -')),
+			'$submit' => t('Save'),
+		));
 		
+		echo $o;
+	}
 	killme();
 }

view/field_combobox.tpl

@@ -0,0 +1,18 @@
+	
+	<div class='field combobox'>
+		<label for='id_$field.0'>$field.1</label>
+		{# html5 don't work on Chrome, Safari and IE9
+		<input id="id_$field.0" type="text" list="data_$field.0" >
+		<datalist id="data_$field.0" >
+		   {{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
+		</datalist> #}
+		
+		<input id="id_$field.0" type="text" value="$field.2">
+		<select id="select_$field.0" onChange="$('#id_$field.0').val($(this).val())">
+			<option value="">$field.5</option>
+			{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
+		</select>
+		
+		<span class='field_help'>$field.3</span>
+	</div>
+

view/filer_dialog.tpl

@@ -0,0 +1,4 @@
+{{ inc field_combobox.tpl }}{{ endinc }}
+<div class="settings-submit-wrapper" >
+	<input id="filer_save" type="button" class="settings-submit" value="$submit" />
+</div>

view/jot-header.tpl

@@ -264,7 +264,21 @@ function enableOnUser(){
 	}
 
 	function itemFiler(id) {
-		reply = prompt("$fileas");
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
@@ -272,7 +286,14 @@ function enableOnUser(){
 					if(timer) clearTimeout(timer);
 					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
 				}
+				return false;
+			});
+		});
+		
 	}
 
 	function jotClearLocation() {

view/theme/dispy-dark/jot-header.tpl

@@ -264,7 +264,21 @@ function enableOnUser(){
 	}
 
 	function itemFiler(id) {
-		reply = prompt("$fileas");
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
@@ -272,9 +286,17 @@ function enableOnUser(){
 					if(timer) clearTimeout(timer);
 					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
 				}
+				return false;
+			});
+		});
+		
 	}
 
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();

view/theme/dispy/jot-header.tpl

@@ -264,7 +264,21 @@ function enableOnUser(){
 	}
 
 	function itemFiler(id) {
-		reply = prompt("$fileas");
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
@@ -272,9 +286,17 @@ function enableOnUser(){
 					if(timer) clearTimeout(timer);
 					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
 				}
+				return false;
+			});
+		});
+		
 	}
 
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();

view/theme/testbubble/jot-header.tpl

@@ -305,6 +305,41 @@ function initEditor(cb) {
 		}
 	}
 	
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();