Commit 835405bb authored by Jason Frisvold's avatar Jason Frisvold
Browse files

- Edit button on feed section of preferences works now

- Removed a bunch of Id tags from the old SVN days
- Some small code cleanup
- Remove some old wml stuff that will never be used
parent d605f19a
......@@ -15,8 +15,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id$ */
/* Standard body element */
body { margin-left: 20px; margin-right: 20px; color: black; background-color: #dddddd; }
......@@ -96,34 +94,9 @@ div#backend_freetag_list { border: 1px dotted rgb(0, 0, 0); padding: 5px; font-s
.error { border: 5px solid #FF0000; }
/* Edit Tags */
.editTags { color: blue; background-color: transparent; text-decoration: underline; cursor: pointer; }
#blanketDiv {
background-color:#111;
opacity: 0.65;
filter:alpha(opacity=65);
position:absolute;
z-index: 9001;
top:0px;
left:0px;
width:100%;
}
#editDiv {
position:absolute;
border: 1px solid;
margin: 10px 10px;
padding:15px 20px;
background-repeat: no-repeat;
background-position: 10px center;
color: #000000;
background-color: #dddddd;
width:300px;
height:300px;
z-index: 9002;
}
#blanket {
background-color : #111;
opacity : 0.65;
......
......@@ -15,8 +15,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id$ */
/* About Licensing : Eric Meyer states this document is in the public domain. */
/* I have included the GPL above as I believe this is */
/* acceptable under the GPL. If not, please let me know */
......
......@@ -6,6 +6,9 @@
New search feature
Added a config option to force HTTPS
Some general file cleanup (remove ID tags, unused code, etc)
New ajax code to handle adding/modifying/deleting feeds
Moved to git, removing old SVN tags
Remove wml files.. Seriously.. It's not happening.. Thankfully.
0.9 Don't include cookies in the redirect URL
Rename the session cookie to avoid naming collisions
......
......@@ -15,8 +15,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id$ */
Installation Instructions
Before beginning, please be sure that you have a working web server.
......
......@@ -15,8 +15,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id$ */
OVERVIEW
The general idea behind this program is to keep all of your todo lists in
......
......@@ -120,13 +120,6 @@
$jsonarray = json_encode(Array('success' => 'true',
'feed_id' => $feed_id));
} elseif ($_REQUEST['action'] == 'editTags') {
assign_tags($smarty, $user_obj);
$output = $smarty->fetch('taglist_edit.tpl');
$jsonarray = json_encode(Array('success' => 'true',
'output' => $output));
}
}
......
......@@ -21,7 +21,6 @@
$( '#feedsTable tbody' ).on('change', 'tr', function() {
if ( ! /dirty/.test($( this ).attr('class')) ) {
$( this ).addClass('dirty');
//alert('Add Dirty');
}
});
......@@ -58,29 +57,35 @@
$( '.editTags' ).each( function() {
$( this ).bind('click', function () {
//$('<div id="blanket"></div><div id="popup"></div>').appendTo('#blanketDiv2');
//$('#blanket').bind('click', function(){
// $('#popup').remove();
// $('#blanket').remove();
// if (window.needs_refresh){
// window.needs_refresh = false;
// location.reload();
// }
//});
//
//var lLeft = ($(window).width() / 4) + "px";
//var lTop = ($(window).height() / 4) + "px";
//$('#popup').css('top', lTop).css('left', lLeft).css('width', $(window).width() / 2 + 'px').css('height', $(window).height() / 2 + 'px');
trToEdit = $( this ).closest('tr');
// Cover the screen in a blanket and show the popup
$('<div id="blanket"></div>' +
'<div id="popup"></div>').appendTo('#formdiv');
// Set the size of the popup
var lLeft = ($(window).width() / 4) + "px";
var lTop = ($(window).height() / 4) + "px";
$('#popup').css('top', lTop)
.css('left', lLeft)
.css('width', $(window).width() / 2 + 'px')
.css('height', $(window).height() / 2 + 'px');
// Variable to hold the taglist input element
taglist = $( this ).siblings('input');
$.ajax({
url: 'feeds_ajax.php',
dataType: 'json',
type: 'POST',
data: {action: 'editTags'},
data: { action: 'tagedit' },
success: function(data) {
if (data.success == 'true') {
trToEdit.after(data.output);
$( '#popup' ).append(data.output);
$( '#tags' ).val( taglist.val() );
$( '#okbutton' ).bind('click', function() {
taglist.val( $( '#tags' ).val() );
$( '#popup' ).remove();
$( '#blanket' ).remove();
});
} else {
ajax_error(data.output);
}
......@@ -103,7 +108,8 @@
success: function(data) {
if (data.success == 'true') {
// Check for an empty table first
if (/No Results/.test($( '#feedsTable > tbody > tr > td' ).html()))
if (/No Results/.test($( '#feedsTable > tbody > tr > td' )
.html()))
$( '#feedsTable > tbody > tr' ).remove();
// Add the new row
......@@ -115,7 +121,8 @@
recolorRows(rows);
// Add delete handler
$( '#feedsTable tbody:last td:nth-child(12) img' ).bind('click', function() {
$( '#feedsTable tbody:last td:nth-child(12) img' )
.bind('click', function() {
$( this ).parents('tr').remove();
// Re-color the rows
......@@ -140,17 +147,15 @@
// Bind the save function for feeds
$( '#feedSave' ).bind('click', function() {
if (/No Results/.test($( '#feedsTable > tbody > tr > td' ).html())) {
alert('Nothing to save?');
return false;
}
//alert('Display Save Banner');
// TODO : Display Save Banner
$('#feedsTable > tbody > tr').each(function(index) {
curRow = $( this );
if ( /dirty/.test(curRow.attr('class')) ) {
curRow.removeClass('dirty');
//alert('Saving Row');
var id_match = /^\d+$/;
var secret_match = /^[a-zA-Z0-9@$%\^&\*\/]{4,15}$/;
......@@ -166,7 +171,6 @@
if ($( this ).val() &&
! validateInput(id_match, $( this ))) {
feedError = true;
alert('feed id error - >' + $( this ).val() + '<');
}
feed_id = $( this ).val();
break;
......@@ -209,7 +213,6 @@
}
}
feed_tag_filter = tagArray.join(',');
alert(feed_tag_filter);
break;
case 'feed_order':
if (! validateInput(id_match, $( this )))
......@@ -230,7 +233,6 @@
});
if (! feedError) {
//alert('Passed validation, saving feed - ' + feed_name);
$.ajax({
url: 'feeds_ajax.php',
......@@ -254,7 +256,6 @@
// Update feed_id
curRow.find('input[name="feed_id"]').val(data.feed_id);
alert('feed_id set to ' + data.feed_id);
// Remove any errors for this cell
curRow.find('td').each(function(index) {
......@@ -276,7 +277,7 @@
}
});
//alert('Remove Save Banner');
// TODO : Remove save banner
return false;
});
......
......@@ -15,8 +15,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id: todolist.js 211 2011-12-31 21:41:47Z Xen0Phage $ */
/* On Window Load */
$(window).load(function () {
$( '#duedate' ).datepicker({
......
......@@ -15,8 +15,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id$ */
function saveuser() {
var usernameRegex = /^[a-zA-Z0-9_\-]{1,15}$/;
var fullnameRegex = /^[a-zA-Z0-9_\-\ \']{1,40}$/;
......
......@@ -16,8 +16,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id$ */
/**
* This is the phpTodo TodoItem class.
* Each object represents a single Todo Entry
......
......@@ -16,8 +16,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id$ */
function assign_priorities(&$smarty, $useall = false, $assign_multi = false) {
global $sqlhdlr;
......
......@@ -16,8 +16,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id$ */
/**
* This is the phpTodo Feed class.
* Each object represents a single Feed
......
......@@ -16,8 +16,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id: phpTodoUser.php 175 2009-11-16 04:21:35Z xen0phage $ */
/**
* This is the phpTodo Tag class.
* Each object represents a single Tag
......
......@@ -16,8 +16,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/* $Id$ */
/**
* This is the phpTodo User class.
* Each object represents a single User
......
......@@ -16,12 +16,6 @@
{* along with this program; if not, write to the Free Software *}
{* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
// Get the browser info and change the content type accordingly
// $browser = get_browser(null, true);
// if ($browser['wap']) {
// header('Content-Type: text/vnd.wap.wml');
// }
// Use a unique session name (ignored if session.auto_start is set to true)
session_name('phpTodo');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment