see Changelog + homepage updates

Author: Koen Deforche

Changelog

@@ -1,3 +1,7 @@
+04-07-2011:
+	* WWebWidget: added childrenChanged() signal and use this in
+	WMenu to track contents stack updates
+
 29-06-2011:
 	* WWidget: show/hide animations also work on FF5 now
 

examples/wt-homepage/CMakeLists.txt

@@ -2,7 +2,7 @@ IF(BOOST_FS_LIB)
 
 INCLUDE(CheckFunctionExists)
 
-WT_ADD_EXAMPLE(Home.wt
+SET(SRC
 	main.C
 	Home.C
 	WtHome.C
@@ -23,6 +23,13 @@ WT_ADD_EXAMPLE(Home.wt
 	../blog/asciidoc/asciidoc.C
 )
 
+IF(WT_EMWEB_BUILD)
+  SET(SRC ${SRC} QuoteForm.C)
+  ADD_DEFINITIONS(-DWT_EMWEB_BUILD)
+ENDIF(WT_EMWEB_BUILD)
+
+WT_ADD_EXAMPLE(Home.wt ${SRC})
+
 TARGET_LINK_LIBRARIES(Home.wt wtdbo wtdbosqlite3 ${BOOST_FS_LIB})
 
 # Test whether crypt(3) is provided by libc. If it's not, check if

examples/wt-homepage/Home.C

@@ -16,14 +16,15 @@
 #include <Wt/WEnvironment>
 #include <Wt/WLogger>
 #include <Wt/WMenu>
+#include <Wt/WPushButton>
 #include <Wt/WStackedWidget>
-#include <Wt/WVBoxLayout>
 #include <Wt/WTabWidget>
 #include <Wt/WTable>
 #include <Wt/WTableCell>
 #include <Wt/WTemplate>
 #include <Wt/WText>
 #include <Wt/WViewWidget>
+#include <Wt/WVBoxLayout>
 
 #include "Home.h"
 #include "view/BlogView.h"
@@ -42,6 +43,7 @@ Home::Home(const WEnvironment& env, const std::string& title,
     sourceViewer_(0)
 {
   messageResourceBundle().use(appRoot() + resourceBundle, false);
+
   useStyleSheet(cssPath + "/wt.css");
   useStyleSheet(cssPath + "/wt_ie.css", "lt IE 7");
   useStyleSheet("css/home.css");
@@ -188,8 +190,14 @@ void Home::setLanguage(int index)
 
 WWidget *Home::linkSourceBrowser(const std::string& example)
 {
-  WAnchor *a = new WAnchor("", tr("source-browser"));
-  a->setRefInternalPath("/" + SRC_INTERNAL_PATH + "/" + example);
+  /*
+   * Instead of using a WAnchor, which will not progress properly because
+   * it is wrapped with wrapView() (-- should we not fix that?), we use
+   * a WText which contains an anchor, and enable internal path encoding.
+   */
+  std::string path = "#/" + SRC_INTERNAL_PATH + "/" + example;
+  WText *a = new WText(tr("source-browser-link").arg(path));
+  a->setInternalPathEncoding(true);
   return a;
 }
 
@@ -276,7 +284,9 @@ WWidget *Home::features()
 
 WWidget *Home::documentation()
 {
-  return new WText(tr("home.documentation"));
+  WText *result = new WText(tr("home.documentation"));
+  result->setInternalPathEncoding(true);
+  return result;
 }
 
 WWidget *Home::otherLanguage()
@@ -343,6 +353,48 @@ void Home::readReleases(WTable *releaseTable)
   }
 }
 
+#ifdef WT_EMWEB_BUILD
+WWidget *Home::quoteForm()
+{
+  WContainerWidget *result = new WContainerWidget();
+  result->setStyleClass("quote");
+
+  WPushButton *quoteButton = new WPushButton(tr("quote.request"), result);
+  WWidget *quoteForm = createQuoteForm();
+  result->addWidget(quoteForm);
+
+  quoteButton->clicked().connect(quoteForm, &WWidget::show);
+  quoteButton->clicked().connect(quoteButton, &WWidget::hide);
+
+  quoteForm->hide();
+
+  return result;
+}
+#endif // WT_EMWEB_BUILD
+
+WWidget *Home::download()
+{
+  WContainerWidget *result = new WContainerWidget();
+  result->addWidget(new WText(tr("home.download")));
+
+  result->addWidget(new WText(tr("home.download.license")));
+
+#ifdef WT_EMWEB_BUILD
+  result->addWidget(quoteForm());
+#endif // WT_EMWEB_BUILD
+
+  result->addWidget(new WText(tr("home.download.packages")));
+
+  releases_ = new WTable();
+  readReleases(releases_);
+  result->addWidget(releases_);
+
+  result->addWidget(new WText(tr("home.download.other")));
+
+  return result;
+}
+
+
 WString Home::tr(const char *key)
 {
   return WString::tr(key);

examples/wt-homepage/Home.h

@@ -77,7 +77,7 @@ class Home : public WApplication
 
 protected:
   virtual WWidget *examples() = 0;
-  virtual WWidget *download() = 0;
+  virtual WWidget *createQuoteForm() = 0;
   virtual WWidget *sourceViewer(const std::string &deployPath) = 0;
   virtual std::string filePrefix() const = 0;
 
@@ -109,6 +109,8 @@ class Home : public WApplication
   WWidget *documentation();
   WWidget *community();
   WWidget *otherLanguage();
+  WWidget *download();
+  WWidget *quoteForm();
 
   WMenu *mainMenu_;
 

examples/wt-homepage/JWtHome.C

@@ -6,8 +6,13 @@
 
 #include "JWtHome.h"
 
+#ifdef WT_EMWEB_BUILD
+#include "QuoteForm.h"
+#endif // WT_EMWEB_BUILD
+
 #include <Wt/WText>
 #include <Wt/WAnchor>
+#include <Wt/WStackedWidget>
 #include <Wt/WTreeNode>
 #include <Wt/WWidget>
 #include <Wt/WViewWidget>
@@ -39,9 +44,13 @@ WWidget *JWtHome::examples()
 {
   WContainerWidget *result = new WContainerWidget();
 
-  result->addWidget(new WText(tr("home.examples")));
+  WText *intro = new WText(tr("home.examples"));
+  intro->setInternalPathEncoding(true);
+  result->addWidget(intro);
 
   examplesMenu_ = new WTabWidget(AlignTop | AlignJustify, result);
+  WAnimation animation(WAnimation::SlideInFromRight, WAnimation::EaseIn);
+  examplesMenu_->contentsStack()->setTransitionAnimation(animation, true);
 
   /*
    * The following code is functionally equivalent to:
@@ -80,20 +89,13 @@ WWidget *JWtHome::examples()
   return result;
 }
 
-WWidget *JWtHome::download()
+WWidget *JWtHome::createQuoteForm()
 {
-  WContainerWidget *result = new WContainerWidget();
-  result->addWidget(new WText(tr("home.download")));
-  result->addWidget(new WText(tr("home.download.license")));
-  result->addWidget(new WText(tr("home.download.packages")));
-
-  releases_ = new WTable();
-  readReleases(releases_);
-  result->addWidget(releases_);
-  result->addWidget(new WText(tr("home.download.requirements")));
-  result->addWidget(new WText(tr("home.download.cvs")));
-
-  return result;
+#ifdef WT_EMWEB_BUILD
+  return new QuoteForm(QuoteForm::JWt);
+#else
+  return 0;
+#endif
 }
 
 WWidget *JWtHome::sourceViewer(const std::string &deployPath)
@@ -137,7 +139,8 @@ WWidget *JWtHome::chatExample()
 WWidget *JWtHome::figtreeExample()
 {
   WContainerWidget *result = new WContainerWidget();
-  new WText(tr("home.examples.figtree"), result);
+  WText *text = new WText(tr("home.examples.figtree"), result);
+  text->setInternalPathEncoding(true);
   return result;
 }
 

examples/wt-homepage/JWtHome.h

@@ -20,7 +20,7 @@ class JWtHome : public Home
 
 protected:
   virtual WWidget *examples();
-  virtual WWidget *download();
+  virtual WWidget *createQuoteForm();
   virtual WWidget *sourceViewer(const std::string& deployPath);
   virtual std::string filePrefix() const { return "jwt-"; }
 

examples/wt-homepage/WtHome.C

@@ -6,6 +6,10 @@
 
 #include "WtHome.h"
 
+#ifdef WT_EMWEB_BUILD
+#include "QuoteForm.h"
+#endif // WT_EMWEB_BUILD
+
 #include <Wt/WAnchor>
 #include <Wt/WEnvironment>
 #include <Wt/WLogger>
@@ -38,7 +42,8 @@ WtHome::WtHome(const WEnvironment& env)
 WWidget *WtHome::example(const char *textKey, const std::string& sourceDir)
 {
   WContainerWidget *result = new WContainerWidget();
-  new WText(tr(textKey), result);
+  WText *w = new WText(tr(textKey), result);
+  w->setInternalPathEncoding(true);
   result->addWidget(linkSourceBrowser(sourceDir));
   return result;
 }
@@ -135,23 +140,13 @@ WWidget *WtHome::examples()
   return result;
 }
 
-WWidget *WtHome::download()
+WWidget *WtHome::createQuoteForm()
 {
-  WContainerWidget *result = new WContainerWidget();
-  result->addWidget(new WText(tr("home.download")));
-  result->addWidget(new WText(tr("home.download.license")));
-  result->addWidget(new WText(tr("home.download.packages")));
-
-  releases_ = new WTable();
-  readReleases(releases_);
-  result->addWidget(releases_);
-  
-  result->addWidget(new WText(tr("home.download.other")));
-
-  result->addWidget(new WText(tr("home.download.requirements")));
-  result->addWidget(new WText(tr("home.download.cvs")));
-
-  return result;
+#ifdef WT_EMWEB_BUILD
+  return new QuoteForm(QuoteForm::Wt);
+#else
+  return 0;
+#endif
 }
 
 WWidget *WtHome::sourceViewer(const std::string& deployPath)

examples/wt-homepage/WtHome.h

@@ -20,7 +20,7 @@ class WtHome : public Home
 
 protected:
   virtual WWidget *examples();
-  virtual WWidget *download();
+  virtual WWidget *createQuoteForm();
   virtual WWidget *sourceViewer(const std::string &internalPath);
   virtual std::string filePrefix() const { return "wt-"; }
 

examples/wt-homepage/css/home.css

@@ -98,6 +98,7 @@ img.java-language-icon {
     width: 90%;
     margin: 5%;
     background: #E1E1E1;
+    border: 5px solid white;
 }
 
 .versions th {
@@ -109,14 +110,99 @@ img.java-language-icon {
     width: 7em;
 }
 
-.versions td, .versions .trh th {
+table.versions td, .versions .trh th {
     text-align: center;
 }
 
 .versions .indent {
     padding-left: 2em;
 }
 
+.versions .multiline {
+    vertical-align: baseline;
+}
+
+.versions .separate td, .versions .separate th {
+    padding-top: 1em;
+}
+
+.versions .r0 {
+    background-color: white;
+}
+
+.versions .r1 {
+}
+
 #footer_wrapper {
     position: relative; /* avoids example menu animation glitch */
+}
+
+.price {
+    font-style: italic;
+}
+
+.smallprint {
+    font-size: smaller;
+}
+
+.quote {
+    text-align: center;
+}
+
+.quote .quoteform {
+    width: 86%;
+    margin: 5%;
+    text-align: left;
+    padding: 2%;
+    background-color: #F1F1F1;
+}
+
+.quote .form {
+    width: 100%;
+    line-height: 1.5em;
+    margin: 1em 0px;
+}
+
+.quote .form .label {
+    text-align: right;
+    padding-right: 1em;
+}
+
+.quote .form .value {
+    width: 65%;
+}
+
+.quote .form input {
+    width: 100%;
+}
+
+.quote .button-box {
+    text-align: center;
+}
+
+.quoteform h4 {
+    border-top: 0px;
+    margin-top: 0px;
+}
+
+.quoteform .licenses {
+    width: 98%;
+    margin: 1em 1%;
+}
+
+.quoteform .licenses td.button {
+    text-align: center;
+    padding: 0px 0.5em;
+}
+
+.quoteform td.button button {
+    width: 2em;
+}
+
+.licenses input {
+    width: 90%;
+}
+
+.quoteform .comment textarea {
+    width: 99%;
 }