aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2012-03-28 03:00:24 -0700
committerfabrixxm <fabrix.xm@gmail.com>2012-03-28 03:00:24 -0700
commit768326e484c02b396badcb239880fc814fc9631b (patch)
tree58dc31cd7fa40bc8bb6beff4967397705ac2437a /view/theme
parent40a65d38e04df5256d05f2a16497c39f83f51bd5 (diff)
parent0a2675d8b698302e50cb64ce5793ab9d22dee329 (diff)
downloadvolse-hubzilla-768326e484c02b396badcb239880fc814fc9631b.tar.gz
volse-hubzilla-768326e484c02b396badcb239880fc814fc9631b.tar.bz2
volse-hubzilla-768326e484c02b396badcb239880fc814fc9631b.zip
Merge pull request #179 from fabrixxm/master
new field_combobox template and some eyecandy to "file as" function
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/dispy-dark/jot-header.tpl40
-rw-r--r--view/theme/dispy/jot-header.tpl40
-rwxr-xr-xview/theme/testbubble/jot-header.tpl35
3 files changed, 97 insertions, 18 deletions
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 4c8f59d79..92eccf740 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -264,17 +264,39 @@ function enableOnUser(){
}
function itemFiler(id) {
- reply = prompt("$fileas");
- 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;
- }
+
+ 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();
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 4c8f59d79..92eccf740 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -264,17 +264,39 @@ function enableOnUser(){
}
function itemFiler(id) {
- reply = prompt("$fileas");
- 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;
- }
+
+ 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();
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index b44ea78fd..0d11da271 100755
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -304,6 +304,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('');