aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvdigital <vdigital@piwigo.org>2007-02-08 21:20:40 +0000
committervdigital <vdigital@piwigo.org>2007-02-08 21:20:40 +0000
commit1f53608976250806d9a37f93e386f53a84aedbbc (patch)
tree23a92181ac7ca7c2b4f657bba59adcd57221b69a
parenta62ab78e2a7060ea1c68c5fa837d0939789786b7 (diff)
Web Service:
- Delete high and normal in #ws_access table - start date is kept. w0p0 template: Minor change git-svn-id: http://piwigo.org/svn/trunk@1791 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/ws_checker.php11
-rw-r--r--install/db/50-database.php54
-rw-r--r--install/phpwebgallery_structure.sql2
-rw-r--r--template/yoga/theme/p0w0/images/button-bg.pngbin175 -> 291 bytes
-rw-r--r--template/yoga/theme/p0w0/theme.css21
5 files changed, 69 insertions, 19 deletions
diff --git a/admin/ws_checker.php b/admin/ws_checker.php
index 305160afd..a52bf5e9b 100644
--- a/admin/ws_checker.php
+++ b/admin/ws_checker.php
@@ -135,8 +135,6 @@ $add_partner = htmlspecialchars( $_POST['add_partner'], ENT_QUOTES);
$add_target = check_target( $_POST['add_target']) ;
$add_end = ( is_numeric($_POST['add_end']) ) ? $_POST['add_end']:0;
$add_request = htmlspecialchars( $_POST['add_request'], ENT_QUOTES);
-$add_high = 'true'; // ( $_POST['add_high'] == 'true' ) ? 'true':'false';
-$add_normal = 'true'; // ( $_POST['add_normal'] == 'true' ) ? 'true':'false';
$add_limit = ( is_numeric($_POST['add_limit']) ) ? $_POST['add_limit']:1;
$add_comment = htmlspecialchars( $_POST['add_comment'], ENT_QUOTES);
if ( strlen($add_partner) < 8 )
@@ -144,13 +142,12 @@ if ( strlen($add_partner) < 8 )
}
$query = '
INSERT INTO '.WEB_SERVICES_ACCESS_TABLE.'
-( `name` , `access` , `start` , `end` , `request` ,
- `high` , `normal` , `limit` , `comment` )
+( `name` , `access` , `start` , `end` , `request` , `limit` , `comment` )
VALUES (' . "
'$add_partner', '$add_target',
NOW(),
ADDDATE( NOW(), INTERVAL $add_end DAY),
- '$add_request', '$add_high', '$add_normal', '$add_limit', '$add_comment' );";
+ '$add_request', '$add_limit', '$add_comment' );";
pwg_query($query);
@@ -223,10 +220,6 @@ if (isset($_POST['wsX_submit']))
$template->assign_vars(
array(
- 'DEFLT_HIGH_YES' => '',
- 'DEFLT_HIGH_NO' => 'checked',
- 'DEFLT_NORMAL_YES' => '',
- 'DEFLT_NORMAL_NO' => 'checked',
'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=web_service',
)
);
diff --git a/install/db/50-database.php b/install/db/50-database.php
new file mode 100644
index 000000000..f0cd2be82
--- /dev/null
+++ b/install/db/50-database.php
@@ -0,0 +1,54 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch : BSF (Best So Far)
+// | file : $Id: 45-database.php 1741 2007-01-22 21:47:03Z vdigital $
+// | last update : $Date: 2007-01-22 22:47:03 +0100 (lun., 22 janv. 2007) $
+// | last modifier : $Author: vdigital $
+// | revision : $Revision: 1741 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation |
+// | |
+// | This program is distributed in the hope that it will be useful, but |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
+// | General Public License for more details. |
+// | |
+// | You should have received a copy of the GNU General Public License |
+// | along with this program; if not, write to the Free Software |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA. |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+ die('Hacking attempt!');
+}
+
+$upgrade_description = 'Remove high and normal columns from #ws_access';
+
+include_once(PHPWG_ROOT_PATH.'include/constants.php');
+
+// +-----------------------------------------------------------------------+
+// | Upgrade content |
+// +-----------------------------------------------------------------------+
+
+echo "Drop some columns from ".WEB_SERVICES_ACCESS_TABLE;
+$query = "
+ALTER TABLE ".WEB_SERVICES_ACCESS_TABLE."
+ DROP `high`,
+ DROP `normal`;";
+pwg_query($query);
+
+echo
+"\n"
+.'"'.$upgrade_description.'"'.' ended'
+."\n"
+;
+
+?>
diff --git a/install/phpwebgallery_structure.sql b/install/phpwebgallery_structure.sql
index 9e9ecb76a..52c671eba 100644
--- a/install/phpwebgallery_structure.sql
+++ b/install/phpwebgallery_structure.sql
@@ -431,8 +431,6 @@ CREATE TABLE `phpwebgallery_ws_access` (
`start` datetime default NULL,
`end` datetime default NULL,
`request` varchar(255) default NULL,
- `high` enum('true','false') NOT NULL default 'true',
- `normal` enum('true','false') NOT NULL default 'true',
`limit` smallint(5) unsigned default NULL,
`comment` varchar(255) default NULL,
PRIMARY KEY (`id`),
diff --git a/template/yoga/theme/p0w0/images/button-bg.png b/template/yoga/theme/p0w0/images/button-bg.png
index 2ba52828b..05765f69f 100644
--- a/template/yoga/theme/p0w0/images/button-bg.png
+++ b/template/yoga/theme/p0w0/images/button-bg.png
Binary files differ
diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css
index 7adb1346b..c282ad524 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/template/yoga/theme/p0w0/theme.css
@@ -1,4 +1,4 @@
-/* $Id: theme.css 1677 2006-12-21 21:38:20Z rub $ */
+/* $Id$ */
/**
* Color scheme (Remember #6699cc = #69c)
@@ -238,14 +238,18 @@ input.submit:focus {
background-color: #369;
}
input.submit[type="reset"],
-input.submit {
- background: url( images/button-bg.png );
- border: 3px double #369;
- border-left-color: #cde;
- border-top-color: #cde;
+input.submit {
+ background-image: url(images/button-bg.png);
+ height:28px;
+ width: 8em;
+ border: 0px;
font-weight: bold;
color: #fff;
- padding: 0.25em;
+ border-bottom-width: 1px;
+ border-right-width: 1px;
+ border-style: outset;
+ border-color: #369;
+ padding: auto 0.25em;
}
input.submit[type="reset"]:active,
input.submit:active {
@@ -255,5 +259,6 @@ input.submit:active {
border-top-color: #9ab;
}
#addComment input.submit {
- padding: 4px 40px;
+ width: 12em;
+ padding: auto 40px;
}