[phaux commit] r138 - Fixed a couple more issued. This project needs love

[codesite...@google.com]

Author: WHarford
Date: Mon Mar 23 17:26:18 2009
New Revision: 138

Added:
trunk/HtmlRoot/whtablefromsql.css (contents, props changed)
Modified:
trunk/Classes/Phaux-render/WHHtmlCanvas.php
trunk/Classes/REServe-Phaux/WHREServeContactModel.php
trunk/Classes/REServe-Phaux/WHREServeModelEdit.php
trunk/Classes/REServe/REArray.php
trunk/Configuration/reservetest.ini

Log:
Fixed a couple more issued. This project needs love

Modified: trunk/Classes/Phaux-render/WHHtmlCanvas.php
==============================================================================
--- trunk/Classes/Phaux-render/WHHtmlCanvas.php (original)
+++ trunk/Classes/Phaux-render/WHHtmlCanvas.php Mon Mar 23 17:26:18 2009
@@ -86,6 +86,12 @@
public function hiddenInput(){
return $this->constructTagWithClass("WHHiddenInputTag");
}
+
+
+ public function image() {
+ return $this->constructTagWithClass("WHImageTag");
+ }
+

public function table(){
return $this->constructTagWithClass("WHTableTag");

Modified: trunk/Classes/REServe-Phaux/WHREServeContactModel.php
==============================================================================
--- trunk/Classes/REServe-Phaux/WHREServeContactModel.php (original)
+++ trunk/Classes/REServe-Phaux/WHREServeContactModel.php Mon Mar 23
17:26:18 2009
@@ -86,7 +86,7 @@
column("phoneNumber",'REString')->
column("email",'REString')->
column("niceness",'REInteger')->
- column('friends',REArray::of('REString'))->
+ /*column('friends',REArray::of('REString'))->*/
column("dayOfMeeting",'REDate')->
column("timeOfMeeting",'RETime');
}

Modified: trunk/Classes/REServe-Phaux/WHREServeModelEdit.php
==============================================================================
--- trunk/Classes/REServe-Phaux/WHREServeModelEdit.php (original)
+++ trunk/Classes/REServe-Phaux/WHREServeModelEdit.php Mon Mar 23 17:26:18
2009
@@ -176,10 +176,10 @@
** I think these scripts are overkill for what I am doing
** but it was one of the better JavaScript cal popups I found
*/
- $htmlRoot->needsScript("date.js");
- $htmlRoot->needsScript("anchorPosition.js");
- $htmlRoot->needsScript("popupWindow.js");
- $htmlRoot->needsScript("calendarPopup.js");
+ $htmlRoot->needsScript("scripts-standard/date.js");
+ $htmlRoot->needsScript("scripts-standard/anchorPosition.js");
+ $htmlRoot->needsScript("scripts-standard/popupWindow.js");
+ $htmlRoot->needsScript("scripts-standard/calendarPopup.js");
return $this;
}
}

Modified: trunk/Classes/REServe/REArray.php
==============================================================================
--- trunk/Classes/REServe/REArray.php (original)
+++ trunk/Classes/REServe/REArray.php Mon Mar 23 17:26:18 2009
@@ -32,7 +32,7 @@

$this->setupActionFromConnection($dbConnection);
$dbConnection->createTableForObject($this);
- $dbConnection->currentObject($this->parentObject);
+ $dbConnection->setCurrentObject($this->parentObject);
return $this;
}

@@ -89,6 +89,7 @@
if($newArray == NULL){
$newArray = array();
}
+
$toAdd = array_diff_assoc($newArray,$oldArray);
$toRemove = array_diff_assoc($oldArray,$newArray);
foreach($toRemove as $var => &$value){
@@ -260,11 +261,12 @@
$this->parentObject->oid());
if(!is_array($oldArray)){
return false;
- }
- if(sizeof(array_diff_assoc($newArray,$oldArray)) > 0){
+ }
+
+ if(sizeof(array_diff_assoc((array)$newArray,$oldArray)) > 0){
return true;
}
- if(sizeof(array_diff_assoc($oldArray,$newArray)) > 0){
+ if(sizeof(array_diff_assoc((array)$oldArray,$newArray)) > 0){
return true;
}

Modified: trunk/Configuration/reservetest.ini
==============================================================================
--- trunk/Configuration/reservetest.ini (original)
+++ trunk/Configuration/reservetest.ini Mon Mar 23 17:26:18 2009
@@ -8,9 +8,9 @@
[REServe]
type="REServeMySQLDriver"
user="root"
-password=""
+password="root"
database="test"
-port="3306"
+port="8889"
automatic_table_creation="1"

Added: trunk/HtmlRoot/whtablefromsql.css
==============================================================================
--- (empty file)
+++ trunk/HtmlRoot/whtablefromsql.css Mon Mar 23 17:26:18 2009
@@ -0,0 +1,153 @@
+.whtablefromsql div.pagination a.pagelink ,.whtablefromsql div.pagination
span.activepage{
+ background : #E8EBF0;
+ border : 1px solid #ccc;
+ margin:2px;
+ padding:5px;
+}
+.whtablefromsql table{
+ border : 1px solid #ccc;
+}
+.whtablefromsql div.pagination span.activepage {
+ background : white;
+}
+div.pagination{
+ padding:8px;
+ text-align:center;
+}
+
+/*For IE*/
+.whtablefromsql div.results{
+ float:right;
+}
+
+/*For Everyone else*/
+html>body .whtablefromsql div.results{
+ float:none;
+ margin-left:190px;
+}
+.whtablefromsql div.filters{
+ float:left;
+ clear:none;
+ width:150px;
+ border: 1px dashed #ccc;
+ margin:0px;
+ padding: 16px;
+
+}
+
+.whtablefromsql div.filters h3{
+ padding:0px;
+ margin-top:-16px;
+ margin-left:-16px;
+ margin-right:-16px;
+ background:#E8EBF0;
+
+}
+.whtablefromsql div.filters form{
+ margin:0px;
+ display:inline;
+}
+.whtablefromsql div.filters form.filter-new{
+ margin:0px;
+}
+.whtablefromsql div.filters .filter-removal{
+ float:right;
+ text-align:center;
+ margin:1px;
+ padding:1px;
+
+}
+.whtablefromsql div.filters .filter-value{
+ margin:3px;
+ width:150px;
+}
+
+.whtablefromsql div.filters .filter-control{
+ font-weight:bold;
+}
+
+.whtablefromsql div.filters .filter-control .filter-label{
+ margin:3px;
+}
+.whtablefromsql div.filters .filter-control a.filter-negation {
+ text-decoration: none;
+ border-bottom: dotted 1px;
+}
+.whtablefromsql div.filters .filter-control a.filter-negation:hover {
+ border:dotted 1px;
+}
+
+
+.whtablefromsql div.filters input{
+ width:100%;
+
+}
+
+.whworkadmin-select{
+ float:right;
+
+}
+.whtablefromsql .clickable:hover{
+ background-color:lightyellow;
+}
+
+
+.whtablefromsql .filter{
+ border-bottom : 1px solid #ccc;
+ padding-left:13px;
+ padding-right:13px;
+ padding-top:5px;
+ margin:-16px;
+ margin-top:1px;
+ margin-bottom:4px;
+}
+
+.whtablefromsql .column-menu {
+ position: absolute;
+ left:auto;
+ right: auto;
+ margin-left:-2px;
+ margin-top:2px;
+ width: 10em;
+ border-right:solid 1px #ccc;
+ border-bottom:solid 2px #ccc;
+ border-left:solid 2px #ccc;
+ background:white;
+ padding:0px;
+
+}
+.whtablefromsql .column-menu div.column-menu-item,
+.whtablefromsql .column-menu div.column-menu-item-active{
+ width:10em;
+
+}
+.whtablefromsql .column-menu div.column-menu-item a,
+.whtablefromsql .column-menu div.column-menu-item-active a {
+ display:block;
+ width:100%;
+ font-weight:normal;
+ color:black;
+ text-decoration: none;
+ padding-top:3px;
+ padding-bottom:2px;
+
+}
+.whtablefromsql .column-menu div.column-menu-item-active a {
+ font-weight:bold;
+}
+
+.whtablefromsql .column-menu div.column-menu-item a:hover,
+.whtablefromsql .column-menu div.column-menu-item-active a:hover {
+ text-decoration: none;
+ background-color:#E8EBF0;
+}
+
+.whtablefromsql .grouped-by-break {
+ font-weight:normal;
+ font-size:150%;
+ background-color:#E8EBF0;
+}
+
+.whtablefromsql .total-row{
+ font-weight:bold;
+}
\ No newline at end of file