allow IE8=IE7 rendering to return with a configuration option

Author: Koen Deforche

examples/widgetgallery/approot/wt_config.xml

@@ -3,5 +3,6 @@
         <web-sockets>false</web-sockets>
 	<progressive-bootstrap>false</progressive-bootstrap>
 	<log-config>* -debug -info:WebRequest</log-config>
+	<UA-Compatible>IE8=IE7</UA-Compatible>
     </application-settings>
 </server>

resources/themes/bootstrap/wt.css

@@ -75,9 +75,13 @@
 /*
  * Custom collapse nav support
  */
-.nav-bar .nav-collapse {
+.navbar .nav-collapse {
   display: block !important;
 }
+.navbar .navbar-inner .container {
+  margin-left: 0px;
+  margin-right: 0px;
+}
 /*
  * Less odd drop down menu support in navbar
  */

resources/themes/bootstrap/wt.less

@@ -61,19 +61,24 @@
 /*
  * Custom collapse nav support
  */
-.nav-bar .nav-collapse {
-	 display: block !important; 
+.navbar .nav-collapse {
+    display: block !important; 
+}
+
+.navbar .navbar-inner .container {
+    margin-left: 0px;
+    margin-right: 0px;
 }
 
 /*
  * Less odd drop down menu support in navbar
  */
 .navbar .nav > li.submenu > a:hover,
 .navbar .nav > li.submenu > a.active {
-  color: @navbarLinkColorActive;
-  text-decoration: none;
-  background-color: @navbarLinkBackgroundActive;
-  .box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
+    color: @navbarLinkColorActive;
+    text-decoration: none;
+    background-color: @navbarLinkBackgroundActive;
+    .box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
 }
 
 /*

src/Wt/WApplication.C

@@ -140,9 +140,17 @@ WApplication::WApplication(const WEnvironment& env
   setLocalizedStrings(0);
 #endif // !WT_TARGET_JAVA
 
-  if (environment().agentIsIE() &&
-      environment().agent() >= WEnvironment::IE9)
-    addMetaHeader(MetaHttpHeader, "X-UA-Compatible", "IE=9");
+  if (environment().agentIsIE()) {
+    if (environment().agent() < WEnvironment::IE9) {
+      const Configuration& conf = environment().server()->configuration(); 
+      bool selectIE7 = conf.uaCompatible().find("IE8=IE7")
+	!= std::string::npos;
+
+      if (selectIE7)
+	addMetaHeader(MetaHttpHeader, "X-UA-Compatible", "IE=7");
+    } else
+      addMetaHeader(MetaHttpHeader, "X-UA-Compatible", "IE=9");
+  }
 
   domRoot_ = new WContainerWidget();
   domRoot_->setStyleClass("Wt-domRoot");

src/Wt/WMenu

@@ -639,7 +639,7 @@ protected:
 
   virtual void renderSelected(WMenuItem *item, bool selected);
 
-  virtual void select(int index, bool changePath);
+  virtual void setCurrent(int index);
 
 private:
   WContainerWidget *ul_;
@@ -666,6 +666,7 @@ private:
   void undoSelectVisual();
   void selectVisual(int item, bool changePath, bool showContents);
   void onItemHidden(int index, bool hidden);
+  void select(int index, bool changePath);
 
   friend class WMenuItem;
 

src/Wt/WMenu.C

@@ -218,7 +218,8 @@ void WMenu::addItem(WMenuItem *item)
       contentsStack_->addWidget(contents);
 
     if (contentsStack_->count() == 1) {
-      current_ = 0;
+      setCurrent(0);
+
       if (contents)
 	contentsStack_->setCurrentWidget(contents);
 
@@ -267,28 +268,33 @@ void WMenu::select(int index)
   select(index, true);
 }
 
+void WMenu::setCurrent(int index)
+{
+  current_ = index;
+}
+
 void WMenu::select(int index, bool changePath)
 {
   int last = current_;
-  current_ = index;
+  setCurrent(index);
 
-  selectVisual(index, changePath, true);
+  selectVisual(current_, changePath, true);
 
   if (index != -1) {
     WMenuItem *item = itemAt(index);
     item->show();
     item->loadContents();
 
-    if (last != index) {
-      item->triggered().emit(item);
-      itemSelected_.emit(item);
-    }
-
     if (changePath && emitPathChange_) {
       WApplication *app = wApp;
       app->internalPathChanged().emit(app->internalPath());
       emitPathChange_ = false;
     }
+
+    if (last != index) {
+      item->triggered().emit(item);
+      itemSelected_.emit(item);
+    }
   }
 }
 

src/Wt/WPainter

@@ -290,19 +290,19 @@ public:
      * Create an image which is located at the <i>uri</i>, and which has
      * dimensions <i>width</i> x <i>height</i>.
      */
-    Image(const std::string& uri, int width, int height);
+    Image(const std::string& url, int width, int height);
 
     /*! \brief Creates an image.
      *
      * Create an image which is located at <i>uri</i> which is available on
      * the local filesystem as <i>file</i>. The image dimensions are
      * retrieved from the file.
      */
-    Image(const std::string& uri, const std::string& file);
+    Image(const std::string& url, const std::string& file);
 
-    /*! \brief Returns the uri.
+    /*! \brief Returns the url.
      */
-    std::string uri() const { return uri_; }
+    std::string uri() const { return url_; }
 
     /*! \brief Returns the image width.
      */
@@ -313,8 +313,10 @@ public:
     int height() const { return height_; }
 
   private:
-    std::string uri_;
+    std::string url_;
     int width_, height_;
+
+    void setUrl(const std::string& url);
   };
 
   /*! \brief Draws an image.

src/Wt/WPainter.C

@@ -13,6 +13,7 @@
 #include "Wt/Render/WTextRenderer"
 #endif
 
+#include "Wt/WApplication"
 #include "Wt/WException"
 #include "Wt/WLineF"
 #include "Wt/WPainter"
@@ -104,15 +105,26 @@ WPainter::State WPainter::State::clone()
 }
 #endif // WT_TARGET_JAVA
 
-WPainter::Image::Image(const std::string& uri, int width, int height)
-  : uri_(uri),
-    width_(width),
+WPainter::Image::Image(const std::string& url, int width, int height)
+  : width_(width),
     height_(height)
-{ }
+{
+  setUrl(url);
+}
 
-WPainter::Image::Image(const std::string& uri, const std::string& fileName)
-  : uri_(uri)
+void WPainter::Image::setUrl(const std::string& url)
 {
+  WApplication *app = WApplication::instance();
+  if (app)
+    url_ = app->resolveRelativeUrl(url);
+  else
+    url_ = url;
+}
+
+WPainter::Image::Image(const std::string& url, const std::string& fileName)
+{
+  setUrl(url);
+
   /*
    * Contributed by Daniel Derr @ ArrowHead Electronics Health-Care
    */

src/Wt/WPopupMenu

@@ -234,7 +234,7 @@ protected:
   virtual bool isExposed(WWidget *widget);
 
   virtual void renderSelected(WMenuItem *item, bool selected);
-  virtual void select(int index, bool changePath);
+  virtual void setCurrent(int index);
 
 private:
   WMenuItem *result_;

src/Wt/WPopupMenu.C

@@ -59,12 +59,6 @@ void WPopupMenu::popupAtButton()
   popup(button_);
 }
 
-void WPopupMenu::select(int index, bool changePath)
-{
-  WMenu::select(index, changePath);
-  WMenu::select(-1, false);
-}
-
 void WPopupMenu::setMaximumSize(const WLength& width,
 				const WLength& height)
 {
@@ -183,6 +177,11 @@ void WPopupMenu::prepareRender(WApplication *app)
   adjustPadding();
 }
 
+void WPopupMenu::setCurrent(int index)
+{
+  // a popup menu does not have a 'current' item.
+}
+
 void WPopupMenu::connectSignals(WPopupMenu * const topLevel)
 {
   itemSelected().connect(topLevel, &WPopupMenu::done);