Several changes:

    - implemented configuration-based meta headers (#2887)
    - fix WDatePicker not closing when clicking date picker icon (#2926)

Author: Koen Deforche

resources/themes/polished/wt.css

@@ -474,6 +474,12 @@ span.Wt-disabled, fieldset.Wt-disabled legend {
     border: 1px inset #CCC;
 }
 
+.Wt-btn[disabled] {
+    border: 1px outset #CCC;
+    cursor: not-allowed;
+    opacity: 0.75;
+}
+
 .Wt-btn-default {
     font-weight: bold;
     border: 1px outset #37E;

src/Wt/WApplication

@@ -72,6 +72,25 @@ class SoundManager;
 typedef boost::function<WApplication* (const WEnvironment&)> ApplicationCreator;
 #endif // !WT_TARGET_JAVA
 
+#ifdef WT_TARGET_JAVA
+/*! \brief An HTML Meta Header
+ */
+#endif // WT_TARGET_JAVA
+struct MetaHeader {
+  /*! \brief Constructor
+   *
+   * Creates a meta header. The lang and user agents are optional, and should
+   * be an empty string if not used.
+   */
+  MetaHeader(MetaHeaderType type, const std::string& name,
+	     const WString& content, const std::string& lang,
+	     const std::string& userAgent);
+  
+  MetaHeaderType type;
+  std::string name, lang, userAgent;
+  WString content;
+};
+
 /*! \class WApplication Wt/WApplication Wt/WApplication
  *  \brief Represents an application instance for a single session.
  *
@@ -1642,33 +1661,36 @@ public:
 
   /*! \brief Adds an HTML meta header.
    *
-   * A meta header can only be added in the following situations:
+   * \sa addMetaHeader(MetaHeaderType, const std::string&, const WString&, const std::string&)
+   */
+  void addMetaHeader(const std::string& name, const WString& content,
+		     const std::string& lang = "");
+
+  /*! \brief Adds an HTML meta header.
+   *
+   * This method sets either a "name" meta headers, which configures a
+   * document property, or a "http-equiv" meta headers, which defines
+   * a HTTP headers (but these latter headers are being deprecated).
+   *
+   * A meta header can however only be added in the following situations:
    *
    * - when a plain HTML session is used (including when the user agent is a
    *   bot), you can add meta headers at any time.
-   *
    * - or, when \ref progressive_bootstrap "progressive bootstrap" is
    *   used, you can set meta headers for any type of session, from
    *   within the application constructor (which corresponds to the
    *   initial request).
-   *
    * - but never for a Wt::WidgetSet mode application since then the
    *   application is hosted within a foreign HTML page.
    *
-   * When a header was previously set for the same \p name, its
-   * contents is replaced.
+   * These situations coincide with WEnvironment::ajax() returning \c
+   * false (see environment()). The reason that it other cases the
+   * HTML page has already been rendered, and will not be rerendered
+   * since all updates are done dynamically.
    *
-   * These situations coincide with WEnvironment::ajax()
-   * returning \c false (see environment()).
-   */
-  void addMetaHeader(const std::string& name, const WString& content,
-		     const std::string& lang = "");
-
-  /*! \brief Adds an HTML meta header.
-   *
-   * This overloaded method allows to define both "name" meta headers,
-   * relating to document properties as well as "http-equiv" meta
-   * headers, which define HTTP headers.
+   * As an alternative, you can use the &lt;meta-headers&gt;
+   * configuration property in the configuration file, which will be
+   * applied in all circumstances.
    *
    * \sa removeMetaHeader()
    */
@@ -2103,15 +2125,6 @@ private:
     bool operator== (const ScriptLibrary& other) const;
   };
 
-  struct MetaHeader {
-    MetaHeader(MetaHeaderType type, const std::string& name,
-	       const WString& content, const std::string& lang);
-
-    MetaHeaderType type;
-    std::string name, lang;
-    WString content;
-  };
-
   struct MetaLink {
     MetaLink(const std::string &href,
 	     const std::string &rel,

src/Wt/WApplication.C

@@ -44,18 +44,20 @@ const WtLibVersion WT_INCLUDED_VERSION = WtLibVersion();
 
 const char *WApplication::RESOURCES_URL = "resourcesURL";
 
+MetaHeader::MetaHeader(MetaHeaderType aType,
+		       const std::string& aName,
+		       const WString& aContent,
+		       const std::string& aLang,
+		       const std::string& aUserAgent)
+  : type(aType), name(aName), lang(aLang), userAgent(aUserAgent),
+    content(aContent)
+{ }
+
 WApplication::ScriptLibrary::ScriptLibrary(const std::string& anUri,
 					   const std::string& aSymbol)
   : uri(anUri), symbol(aSymbol)
 { }
 
-WApplication::MetaHeader::MetaHeader(MetaHeaderType aType,
-				     const std::string& aName,
-				     const WString& aContent,
-				     const std::string& aLang)
-  : type(aType), name(aName), lang(aLang), content(aContent)
-{ }
-
 WApplication::MetaLink::MetaLink(const std::string &aHref,
 				 const std::string &aRel,
 				 const std::string &aMedia,
@@ -1103,7 +1105,8 @@ void WApplication::addMetaHeader(MetaHeaderType type,
   }
 
   if (!content.empty())
-    metaHeaders_.push_back(MetaHeader(type, name, content, lang));
+    metaHeaders_.push_back(MetaHeader(type, name, content, lang,
+				      std::string()));
 }
 
 void WApplication::removeMetaHeader(MetaHeaderType type,

src/Wt/WDatePicker.C

@@ -100,7 +100,6 @@ void WDatePicker::create(WInteractWidget *displayWidget,
 
   displayWidget->clicked().connect(popup_, &WWidget::show);
   displayWidget->clicked().connect(this, &WDatePicker::setFromLineEdit);
-  displayWidget->clicked().preventPropagation();
 
   if (!forEdit_->validator())
     forEdit_->setValidator(new WDateValidator(format_, this));

src/Wt/WPdfImage.C

@@ -30,12 +30,6 @@
 #endif
 
 namespace {
-  std::string toUpper(const std::string& s) {
-    std::string result = s;
-    std::transform(result.begin(), result.end(), result.begin(), toupper);
-    return result;
-  }
-
   void HPDF_STDCALL error_handler(HPDF_STATUS   error_no,
 		                  HPDF_STATUS   detail_no,
 		                  void         *user_data) {

src/Wt/WWebWidget.C

@@ -1770,7 +1770,7 @@ bool WWebWidget::needsToBeRendered() const
 }
 
 bool WWebWidget::setFirstFocus() {
-  for (int i = 0; i < children().size(); i++)
+  for (unsigned i = 0; i < children().size(); i++)
     if (children()[i]->setFirstFocus())
       return true;
 

src/web/Configuration.C

@@ -813,6 +813,41 @@ void Configuration::readApplicationSettings(xml_node<> *app)
         properties_[name] = value;
     }
   }
+
+  std::vector<xml_node<> *> metaHeaders = childElements(app, "meta-headers");
+  for (unsigned i = 0; i < metaHeaders.size(); ++i) {
+    xml_node<> *metaHeader = metaHeaders[i];
+
+    std::string userAgent;
+    attributeValue(metaHeader, "user-agent", userAgent);
+
+    std::vector<xml_node<> *> metas = childElements(metaHeader, "meta");
+    for (unsigned j = 0; j < metas.size(); ++j) {
+      xml_node<> *meta = metas[j];
+      
+      std::string name, property, httpEquiv, content;
+      attributeValue(meta, "name", name);
+      attributeValue(meta, "http-equiv", httpEquiv);
+      attributeValue(meta, "property", property);
+      attributeValue(meta, "content", content);
+
+      MetaHeaderType type;
+      if (!name.empty())
+	type = MetaName;
+      else if (!httpEquiv.empty()) {
+	type = MetaHttpHeader;
+	name = httpEquiv;
+      } else if (!property.empty()) {
+	type = MetaProperty;
+	name = property;
+      } else {
+	throw WServer::Exception
+	  ("<meta> requires attribute 'name', 'property' or 'http-equiv'");
+      }
+
+      metaHeaders_.push_back(MetaHeader(type, name, content, "", userAgent));
+    }
+  }
 }
 
 void Configuration::rereadConfiguration()

src/web/Configuration.h

@@ -123,6 +123,7 @@ class WT_API Configuration
   void setNumThreads(int threads);
 #endif // WT_TARGET_JAVA
 
+  const std::vector<MetaHeader>& metaHeaders() const { return metaHeaders_; }
   SessionPolicy sessionPolicy() const;
   int numProcesses() const;
   int numThreads() const;
@@ -239,6 +240,7 @@ class WT_API Configuration
   bool            webglDetection_;
 
   std::vector<BootstrapEntry> bootstrapConfig_;
+  std::vector<MetaHeader> metaHeaders_;
 
   bool connectorSlashException_;
   bool connectorNeedReadBody_;

src/web/WebRenderer.C

@@ -11,6 +11,7 @@
 #include "Wt/WApplication"
 #include "Wt/WContainerWidget"
 #include "Wt/WRandom"
+#include "Wt/WRegExp"
 #include "Wt/WWebWidget"
 #include "Wt/WStringStream"
 #include "Wt/WTheme"
@@ -1754,32 +1755,75 @@ void WebRenderer::learningIncomplete()
 std::string WebRenderer::headDeclarations() const
 {
   EscapeOStream result;
+ 
+  const Configuration& conf = session_.env().server()->configuration();
+
+  const std::vector<MetaHeader>& confMetaHeaders = conf.metaHeaders();
+  std::vector<MetaHeader> metaHeaders;
+
+  for (unsigned i = 0; i < confMetaHeaders.size(); ++i) {
+    const MetaHeader& m = confMetaHeaders[i];
+
+    bool add = true;
+    if (!m.userAgent.empty()) {
+      WT_USTRING s = WT_USTRING::fromUTF8(session_.env().userAgent());
+      WRegExp expr(WT_USTRING::fromUTF8(m.userAgent));
+      if (!expr.exactMatch(s))
+	add = false;
+    }
+
+    if (add)
+      metaHeaders.push_back(confMetaHeaders[i]);
+  }
 
   if (session_.app()) {
-    for (unsigned i = 0; i < session_.app()->metaHeaders_.size(); ++i) {
-      const WApplication::MetaHeader& m = session_.app()->metaHeaders_[i];
+    const std::vector<MetaHeader>& appMetaHeaders
+      = session_.app()->metaHeaders_;
 
-      result << "<meta";
+    for (unsigned i = 0; i < appMetaHeaders.size(); ++i) {
+      const MetaHeader& m = appMetaHeaders[i];
 
-      if (!m.name.empty()) {
-	std::string attribute;
-	switch (m.type) {
-	case MetaName: attribute = "name"; break;
-	case MetaProperty: attribute = "property"; break;
-	case MetaHttpHeader: attribute = "http-equiv"; break;
-	}
+      bool add = true;
+      for (unsigned j = 0; j < metaHeaders.size(); ++j) {
+	MetaHeader& m2 = metaHeaders[j];
 
-	appendAttribute(result, attribute, m.name);
+	if (m.type == m2.type && m.name == m2.name) {
+	  m2.content = m.content;
+	  add = false;
+	  break;
+	}
       }
 
-      if (!m.lang.empty())
-	appendAttribute(result, "lang", m.lang);
+      if (add)
+	metaHeaders.push_back(m);
+    }
+  }
 
-      appendAttribute(result, "content", m.content.toUTF8());
+  for (unsigned i = 0; i < metaHeaders.size(); ++i) {
+    const MetaHeader& m = metaHeaders[i];
 
-      closeSpecial(result);
+    result << "<meta";
+
+    if (!m.name.empty()) {
+      std::string attribute;
+      switch (m.type) {
+      case MetaName: attribute = "name"; break;
+      case MetaProperty: attribute = "property"; break;
+      case MetaHttpHeader: attribute = "http-equiv"; break;
+      }
+
+      appendAttribute(result, attribute, m.name);
     }
-    
+
+    if (!m.lang.empty())
+      appendAttribute(result, "lang", m.lang);
+
+    appendAttribute(result, "content", m.content.toUTF8());
+
+    closeSpecial(result);
+  }
+
+  if (session_.app()) {
     for (unsigned i = 0; i < session_.app()->metaLinks_.size(); ++i) {
       const WApplication::MetaLink& ml = session_.app()->metaLinks_[i];
 
@@ -1807,7 +1851,6 @@ std::string WebRenderer::headDeclarations() const
        *          progressive boot.
        */
       if (session_.env().agent() < WEnvironment::IE9) {
-	const Configuration& conf = session_.env().server()->configuration(); 
 	bool selectIE7 = conf.uaCompatible().find("IE8=IE7")
 	  != std::string::npos;
 

src/web/WebRenderer.h

@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 #include <set>
+
 #include "Wt/WDateTime"
 #include "Wt/WEnvironment"
 #include "Wt/WStatelessSlot"
@@ -20,7 +21,9 @@ class WebRequest;
 class WebResponse;
 class WebStream;
 class DomElement;
+class EscapeOStream;
 class FileServe;
+class MetaHeader;
 
 class WApplication;
 class WWidget;