From 48d69dfd2830427e43dd8fec0e0eac04c8084cb2 Mon Sep 17 00:00:00 2001 From: Matthew Wilson Date: Thu, 1 Dec 2005 01:15:42 +0000 Subject: [PATCH] committing the new dash design, along with delete button functionality. edit button functionality to come. --- docs/upgrades/upgrade_6.7.8-6.8.0.pl | 131 ++-------- lib/WebGUI/Asset/Wobject/Dashboard.pm | 4 +- lib/WebGUI/Asset/Wobject/WeatherData.pm | 11 +- www/extras/wobject/Dashboard/add2.gif | Bin 0 -> 923 bytes www/extras/wobject/Dashboard/background.gif | Bin 0 -> 1190 bytes www/extras/wobject/Dashboard/bg.gif | Bin 0 -> 46 bytes www/extras/wobject/Dashboard/body_bg.gif | Bin 0 -> 32279 bytes www/extras/wobject/Dashboard/bookmark.gif | Bin 0 -> 1044 bytes www/extras/wobject/Dashboard/closeMod.gif | Bin 0 -> 88 bytes www/extras/wobject/Dashboard/column_dot.gif | Bin 0 -> 43 bytes www/extras/wobject/Dashboard/content_bg.gif | Bin 0 -> 3487 bytes www/extras/wobject/Dashboard/dashboard.css | 224 ++++++++++++++++++ www/extras/wobject/Dashboard/delete_btn.jpg | Bin 0 -> 997 bytes www/extras/wobject/Dashboard/dragable_bg.gif | Bin 0 -> 1913 bytes www/extras/wobject/Dashboard/draggable.css | 115 ++++++--- www/extras/wobject/Dashboard/draggable.js | 81 ++++--- www/extras/wobject/Dashboard/dragtitle_bg.gif | Bin 0 -> 1433 bytes www/extras/wobject/Dashboard/edit_btn.jpg | Bin 0 -> 855 bytes www/extras/wobject/Dashboard/gmail.gif | Bin 0 -> 361 bytes www/extras/wobject/Dashboard/header_bg.gif | Bin 0 -> 199 bytes www/extras/wobject/Dashboard/hide_btn.jpg | Bin 0 -> 799 bytes www/extras/wobject/Dashboard/move_btn.jpg | Bin 0 -> 680 bytes www/extras/wobject/Dashboard/note.gif | Bin 0 -> 361 bytes www/extras/wobject/Dashboard/search.gif | Bin 0 -> 350 bytes .../wobject/Dashboard/showModBlueNav.gif | Bin 0 -> 58 bytes www/extras/wobject/Dashboard/weather.gif | Bin 0 -> 1071 bytes .../wobject/Dashboard/weather_delete.gif | Bin 0 -> 127 bytes www/extras/wobject/Dashboard/writely.gif | Bin 0 -> 607 bytes 28 files changed, 379 insertions(+), 187 deletions(-) create mode 100644 www/extras/wobject/Dashboard/add2.gif create mode 100644 www/extras/wobject/Dashboard/background.gif create mode 100644 www/extras/wobject/Dashboard/bg.gif create mode 100644 www/extras/wobject/Dashboard/body_bg.gif create mode 100644 www/extras/wobject/Dashboard/bookmark.gif create mode 100644 www/extras/wobject/Dashboard/closeMod.gif create mode 100644 www/extras/wobject/Dashboard/column_dot.gif create mode 100644 www/extras/wobject/Dashboard/content_bg.gif create mode 100644 www/extras/wobject/Dashboard/dashboard.css create mode 100644 www/extras/wobject/Dashboard/delete_btn.jpg create mode 100644 www/extras/wobject/Dashboard/dragable_bg.gif create mode 100644 www/extras/wobject/Dashboard/dragtitle_bg.gif create mode 100644 www/extras/wobject/Dashboard/edit_btn.jpg create mode 100644 www/extras/wobject/Dashboard/gmail.gif create mode 100644 www/extras/wobject/Dashboard/header_bg.gif create mode 100644 www/extras/wobject/Dashboard/hide_btn.jpg create mode 100644 www/extras/wobject/Dashboard/move_btn.jpg create mode 100644 www/extras/wobject/Dashboard/note.gif create mode 100644 www/extras/wobject/Dashboard/search.gif create mode 100644 www/extras/wobject/Dashboard/showModBlueNav.gif create mode 100644 www/extras/wobject/Dashboard/weather.gif create mode 100644 www/extras/wobject/Dashboard/weather_delete.gif create mode 100644 www/extras/wobject/Dashboard/writely.gif diff --git a/docs/upgrades/upgrade_6.7.8-6.8.0.pl b/docs/upgrades/upgrade_6.7.8-6.8.0.pl index 27371588e..3fcd6c7c5 100644 --- a/docs/upgrades/upgrade_6.7.8-6.8.0.pl +++ b/docs/upgrades/upgrade_6.7.8-6.8.0.pl @@ -27,7 +27,6 @@ my $quiet; start(); addTimeZonesToUserPreferences(); -fixVeryLateDates(); removeUnneededFiles(); updateCollaboration(); addPhotoField(); @@ -41,6 +40,7 @@ addInOutBoard(); addDashboardStuff(); addZipArchive(); updateUserProfileDayLabels(); +fixVeryLateDates(); finish(); #------------------------------------------------- @@ -202,67 +202,28 @@ my $newAsset = $folder->addChild({ }, 'PBtmplBlankStyle000001'); $newAsset->commit; $template = < - -table.dashboardColumn { -width: 100%; -background: none; -background-color:transparent; -} -.availableDashlet { -} -div#dashboardContainer { -font: 11px Lucida Grande, Verdana, Arial, Helvetica, sans serif; -background: url(^Extras;wobject/Dashboard/background.gif) repeat-x #fff; -} -table#dashboardChooserContainer { -margin:0px; -padding:0px; -border:0px; - -} - -tbody.availableDashlet * div.content { display: none; } -div#availableDashlets * td {width:100px;} -div#availableDashlets * div.content {width:100px; overflow-x:hidden;} -div#columnsContainerDiv { -margin:6px; -} -td {vertical-align: top;} -h1 { -font: 15px Lucida Grande, Verdana, Arial, Helvetica, sans serif; -} - + + +
- +
- -
- - + +
+
+ + + +

+
+
 - @@ -332,20 +282,8 @@ function AjaxRequestEnd() { } @@ -353,40 +291,17 @@ function AjaxRequestEnd() { }
Add New Content
 +
Add New Content

@@ -311,19 +272,8 @@ function AjaxRequestEnd() { }

- - - - - +
-
-
-
-
- -
-
-

+
- - - - - +
-
-
- -
-
- -
-
-

+
- - - - - +
-
-
- -
-
-
-
-

+
- - - - -
+
-
-
+ STOP $newAsset = $folder->addChild({ title=>"Dashboard Default View", diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm index ac99b7ba4..a547f39e5 100644 --- a/lib/WebGUI/Asset/Wobject/Dashboard.pm +++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm @@ -216,8 +216,8 @@ sub view { } } $vars{showAdmin} = ($session{var}{adminOn} && $self->canEdit); - WebGUI::Style::setScript($session{config}{extrasURL}."/wobject/Dashboard/draggable.js",{ type=>"text/javascript" }); - WebGUI::Style::setLink($session{config}{extrasURL}."/wobject/Dashboard/draggable.css",{ type=>"text/css", rel=>"stylesheet", media=>"all" }); +# WebGUI::Style::setScript($session{config}{extrasURL}."/wobject/Dashboard/draggable.js",{ type=>"text/javascript" }); +# WebGUI::Style::setLink($session{config}{extrasURL}."/wobject/Dashboard/draggable.css",{ type=>"text/css", rel=>"stylesheet", media=>"all" }); $vars{"dragger.init"} = '