Commits

Anonymous committed 1fa060d Merge

Merge branch 'development' of github.com:encuestame/encuestame into dianmorales

Comments (0)

Files changed (30)

encuestame-assembly/src/main/assembly/release.xml

 
     <files> 
         <file> 
-            <source>../encuestame-war/target/encuestame-${artifact.version}-beta.war</source>
+            <source>../encuestame-war/target/encuestame.war</source>
             <outputDirectory>encuestame-${artifact.version}-release/webapp</outputDirectory>
         </file>
 	<file> 

encuestame-core/src/main/resources/org/encuestame/core/config/encuestame-config.properties

 encuestame.database.version = 1
 
 #-----------------------------------------------------------------------------
+# if false use the compressed static files if not, development status is enabled and
+# use uncompressed static files, useful to development
+encuestame.development = true
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
 # Required configuration settings
 #-----------------------------------------------------------------------------
 

encuestame-mvc/src/main/java/org/encuestame/mvc/controller/security/ForgetPasswordController.java

 
 import org.apache.log4j.Logger;
 import org.encuestame.core.security.util.PasswordGenerator;
+import org.encuestame.core.util.ConvertDomainBean;
 import org.encuestame.mvc.validator.ValidateOperations;
+import org.encuestame.persistence.domain.security.UserAccount;
+import org.encuestame.persistence.exception.EnMeExpcetion;
 import org.encuestame.persistence.exception.EnMeNoResultsFoundException;
 import org.encuestame.utils.captcha.ReCaptchaResponse;
 import org.encuestame.utils.security.ForgotPasswordBean;
                 req.getRemoteAddr(), challenge, response);
         final ValidateOperations validation = new ValidateOperations(
                 getSecurityService());
-        if (validation.validateUserEmail((email == null ? "" : email),
-                getUserAccount())) {
+        final UserAccount userValidate = validation.checkifEmailExist((email == null ? "" : email));
+        if (userValidate == null) {
             result.rejectValue("email", "secure.email.notvalid",
                     new Object[] { user.getEmail() }, "");
         }
-        validation.validateCaptcha(reCaptchaResponse, result);
-        log.info("reCaptchaResponse " + reCaptchaResponse.getErrorMessage());
         log.info("reCaptchaResponse " + reCaptchaResponse.isValid());
+        //validate reCaptcha
+        validation.validateCaptcha(reCaptchaResponse, result);
+        if(reCaptchaResponse.getErrorMessage() != null) {
+            log.fatal("reCaptcha Fatal Error: "+reCaptchaResponse.getErrorMessage());
+        }
         log.info("result.hasErrors() " + result.hasErrors());
         if (result.hasErrors()) {
             return "forgot";
         } else {
             final String password = PasswordGenerator.getPassword(6);
-            // try {
-            // //getSecurityService().renewPassword(unitUserBean, password);
-            // //TODO: refactor this method.
-            // log.debug("foo");
-            // } catch (EnMeExpcetion e) {
-            // log.error("Error Renewd password "+e.getMessage());
-            // return "forgot";
-            // }
+            try {
+                /*
+                 * Stuffs to change;
+                 * 1. user should be to change own password, not auto generate
+                 * 2. instead redirect to sign in page, should be to success page.
+                 */
+                getSecurityService().renewPassword(
+                                ConvertDomainBean
+                                        .convertBasicSecondaryUserToUserBean(userValidate),
+                                password);
+                log.debug("foo");
+            } catch (EnMeExpcetion e) {
+                log.error("Error Renewd password " + e.getMessage());
+                return "forgot";
+            }
             status.setComplete();
-            log.info("password generated " + password);
-            return "redirect:/user/signup";
+            log.info("password generated: " + password);
+            return "redirect:/user/signin";
         }
     }
 }

encuestame-mvc/src/main/java/org/encuestame/mvc/interceptor/EnMeSecurityInterceptor.java

             log.info("Session Expired");
             request.setAttribute("logged", false);
         }
+        //enable or disable development status
+        request.setAttribute("development", EnMePlaceHolderConfigurer.getBooleanProperty("encuestame.development"));
         //customized logo
         request.setAttribute("logo", this.getCustomizedHeaderLogo());
         return true;

encuestame-mvc/src/main/java/org/encuestame/mvc/validator/ValidateOperations.java

     }
 
     /**
+     *
+     * @param email
+     * @return
+     */
+    public UserAccount checkifEmailExist(final String email) {
+        log.debug("checkifEmailExist email... ->"+email);
+        final UserAccount user = getSecurityService().findUserAccountByEmail(email);
+        return user;
+    }
+
+    /**
      * Validate user email.
      * @param email
      * @param user

encuestame-persistence/src/main/java/org/encuestame/persistence/domain/security/UserAccount.java

  */
 package org.encuestame.persistence.domain.security;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
   )
 @Indexed(index="UserAccount")
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-public class UserAccount extends AbstractGeoPoint{
+public class UserAccount extends AbstractGeoPoint implements Serializable{
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = -184652572883512949L;
 
     private Long uid;
     private String completeName;

encuestame-utils/src/main/java/org/encuestame/utils/captcha/ReCaptchaImpl.java

 import java.util.Enumeration;
 import java.util.Properties;
 
+import org.apache.log4j.Logger;
 import org.encuestame.utils.captcha.http.HttpLoader;
 import org.encuestame.utils.captcha.http.SimpleHttpLoader;
 
 
 public class ReCaptchaImpl implements ReCaptcha {
 
+    /**
+     * Log.
+     */
+    private Logger log = Logger.getLogger(this.getClass());
+
     public static final String PROPERTY_THEME = "theme";
     public static final String ENCODE = "UTF-8";
     public static final String PROPERTY_TABINDEX = "tabindex";
     private boolean includeNoscript = false;
     private HttpLoader httpLoader = new SimpleHttpLoader();
 
+    /**
+     *
+     * @param privateKey
+     */
     public void setPrivateKey(String privateKey) {
         this.privateKey = privateKey;
     }
+
+    /**
+     *
+     * @param publicKey
+     */
     public void setPublicKey(String publicKey) {
         this.publicKey = publicKey;
     }
+
+    /**
+     *
+     * @param recaptchaServer
+     */
     public void setRecaptchaServer(String recaptchaServer) {
         this.recaptchaServer = recaptchaServer;
     }
+
+    /**
+     *
+     * @param includeNoscript
+     */
     public void setIncludeNoscript(boolean includeNoscript) {
         this.includeNoscript = includeNoscript;
     }
+
+    /**
+     *
+     * @param verifyUrl
+     */
     public void setVerifyUrl(String verifyUrl) {
         this.verifyUrl = verifyUrl;
     }
+
+    /**
+     *
+     * @param httpLoader
+     */
     public void setHttpLoader(HttpLoader httpLoader) {
         this.httpLoader  = httpLoader;
     }
 
-    public ReCaptchaResponse checkAnswer(String remoteAddr, String challenge, String response) {
-
-
-        StringBuffer postParameters = new StringBuffer("privatekey=");
+    /**
+     * Check reCaptcha Answer.
+     */
+    public ReCaptchaResponse checkAnswer(final String remoteAddr, final String challenge, final String response) {
+//        StringBuffer postParameters = new StringBuffer("privatekey=");
+//        try {
+//            postParameters.append("privatekey=");
+//            postParameters.append(URLEncoder.encode(privateKey, ENCODE));
+//            postParameters.append("&remoteip=");
+//            postParameters.append(URLEncoder.encode(remoteAddr, ENCODE));
+//            postParameters.append("&challenge=");
+//            postParameters.append(URLEncoder.encode(challenge, ENCODE));
+//            postParameters.append("&response=");
+//            postParameters.append(URLEncoder.encode(response, ENCODE));
+//        } catch (UnsupportedEncodingException e) {
+//            postParameters = new StringBuffer("");
+//        }
+          String postParameters;
         try {
-            postParameters.append("privatekey=");
-            postParameters.append(URLEncoder.encode(privateKey, ENCODE));
-            postParameters.append("&remoteip=");
-            postParameters.append(URLEncoder.encode(remoteAddr, ENCODE));
-            postParameters.append("&challenge=");
-            postParameters.append(URLEncoder.encode(challenge, ENCODE));
-            postParameters.append("&response=");
-            postParameters.append(URLEncoder.encode(response, ENCODE));
+          postParameters = "privatekey=" + URLEncoder.encode(privateKey,ENCODE) + "&remoteip=" + URLEncoder.encode(remoteAddr,ENCODE) +
+            "&challenge=" + URLEncoder.encode(challenge,ENCODE) + "&response=" + URLEncoder.encode(response,ENCODE);
         } catch (UnsupportedEncodingException e) {
-            postParameters = new StringBuffer("");
-        }
-
-        //final String postParameters = "privatekey=" + URLEncoder.encode(privateKey,ENCODE) + "&remoteip=" + URLEncoder.encode(remoteAddr,ENCODE) +
-        //    "&challenge=" + URLEncoder.encode(challenge,ENCODE) + "&response=" + URLEncoder.encode(response,ENCODE);
-
+         postParameters = "";
+       }
+       log.debug("reCaptcha checkAnswer :"+postParameters);
         final String message;
         try {
             message = httpLoader.httpPost(verifyUrl, postParameters.toString());
-
+            log.debug("reCaptcha message :"+message);
             if (message == null) {
                 return new ReCaptchaResponse(false, "recaptcha-not-reachable");
             }
         }
         catch (ReCaptchaException networkProblem) {
+            log.error("ReCaptchaException: "+networkProblem);
             return new ReCaptchaResponse(false, "recaptcha-not-reachable");
         }
 
             else
                 errorMessage = "recaptcha4j-missing-error-message";
         }
-
+        log.debug("reCaptcha errorMessage :"+errorMessage);
         return new ReCaptchaResponse(valid, errorMessage);
     }
 

encuestame-war/pom.xml

     <filters>
             <filter>../env/${env}.properties</filter>
        </filters>
-    <finalName>encuestame-${project.version}-beta</finalName>
+    <finalName>encuestame</finalName>
     <plugins>
         <plugin>
            <groupId>org.mortbay.jetty</groupId>
                                 resource/js/org/**/*,
                                 resource/js/org/**/*,
                                 resource/js/encuestame.profile.js,
+                                resource/js/req/*,
                                 resource/js/default.js, <!-- This file is because a issue on Dojo 1.6 with AMD modules. -->
                                 **/*.properties,
                                 **/*.tld,

encuestame-war/src/main/resources/encuestame-config-custom.properties.sample

 encuestame.home=.
 
 #************************************************************************************
+# !!! ATTENTION PLEASE !!!
+# If you use DEMO profile, should be FALSE
+encuestame.development = true
+#************************************************************************************
+
+#************************************************************************************
 
 # Custom Database configuration settings
 

encuestame-war/src/main/webapp/WEB-INF/jsp/includes/javascript.jsp

         };
 </script>
 <script src="<%=request.getContextPath()%>/resources/js/default.js"></script>
-<script src="<%=request.getContextPath()%>/resources/js/raphael-min.js"></script>
-<script src="<%=request.getContextPath()%>/resources/js/dojo/encuestame-commons.js?<%=EnMePlaceHolderConfigurer.getProperty("app.version")%>"></script>
+<script src="<%=request.getContextPath()%>/resources/js/req/raphael-min.js"></script>
+ <c:if test="${!development}">
+    <script src="<%=request.getContextPath()%>/resources/js/dojo/encuestame-commons.js?<%=EnMePlaceHolderConfigurer.getProperty("app.version")%>"></script>
+</c:if>
 <%-- <script src="<%=request.getContextPath()%>/resources/js/encuestame/encuestame.js"></script> --%>
 <%=WidgetUtil.getAnalytics("analytics.inc")%>

encuestame-war/src/main/webapp/WEB-INF/jsp/includes/web/css.jsp

-<link rel="stylesheet"  href="<c:url value="/resources/css/common.css" />" />
-<link rel="stylesheet"  href="<c:url value="/resources/css/web/layout.css" />" />
-<link rel="stylesheet"  href="<c:url value="/resources/css/reset.css" />" />
-<link rel="stylesheet"  href="<c:url value="/resources/css/web/default.css" />" />
-<link rel="stylesheet"  href="<c:url value="/resources/css/web/user.css" />" />
-<link rel="stylesheet"  href="<c:url value="/resources/css/web/public.css" />" />
-<link rel="stylesheet"  href="<c:url value="/resources/css/web/menu.css" />" />
-<link rel="stylesheet"  href="<c:url value="/resources/css/web/admon.css" />" />
-<link rel="stylesheet"  href="<c:url value="/resources/static/web.css" />" />
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp"%>
+ <c:if test="${development}">
+    <link rel="stylesheet"  href="<c:url value="/resources/css/common.css" />" />
+    <link rel="stylesheet"  href="<c:url value="/resources/css/web/layout.css" />" />
+    <link rel="stylesheet"  href="<c:url value="/resources/css/reset.css" />" />
+    <link rel="stylesheet"  href="<c:url value="/resources/css/web/default.css" />" />
+    <link rel="stylesheet"  href="<c:url value="/resources/css/web/user.css" />" />
+    <link rel="stylesheet"  href="<c:url value="/resources/css/web/public.css" />" />
+    <link rel="stylesheet"  href="<c:url value="/resources/css/web/menu.css" />" />
+    <link rel="stylesheet"  href="<c:url value="/resources/css/web/admon.css" />" />
+</c:if>
+ <c:if test="${!development}">
+    <link rel="stylesheet"  href="<c:url value="/resources/static/web.css" />" />
+</c:if>
 <link rel="stylesheet"  href="<c:url value="/resources/js/dijit/themes/claro/claro.css"/>" />
 <link rel="stylesheet"  href="<c:url value="/resources/js/dojox/form/resources/Rating.css"/>" />
 <link rel="stylesheet"  href="<c:url value="/resources/js/dojo/resources/dojo.css" />" />

encuestame-war/src/main/webapp/WEB-INF/layouts/standard/page.jsp

     <%@ include file="/WEB-INF/jsp/includes/web/css.jsp" %>
       <!-- All JavaScript at the bottom, except for Modernizr / Respond.
        Modernizr enables HTML5 elements & feature detects; Respond is a polyfill for min/max-width CSS3 Media Queries-->
-    <script src="<%=request.getContextPath()%>/resources/js/modernizr-2.0.6.js"></script>
+    <script src="<%=request.getContextPath()%>/resources/js/req/modernizr-2.0.6.js"></script>
 </head>
 <body class="claro">
      <header id="header">

encuestame-war/src/main/webapp/WEB-INF/messages/messages_en_US.properties

 secure.realName.empty =  A real name is required!
 secure.type.not.valid = What are you doing?
 
+signin.error=Your sign in information was incorrect.
+signin.error.description = Please try again or
+signin.error.signup = sign up
+signin.error.free = for free.
+signin.username = Username
+signin.password = Password
+signin.forgot = Forgot your password?
+signin.signup = You need account?
+signin.social.message = Do you already have an account on one of these sites? Click the logo to log in with it here:
+
+
+forgot.username = Please instroduce your email or username
+forgot.submit = Rescover my password
+
 #######################
 # Notification Messages
 #######################

encuestame-war/src/main/webapp/WEB-INF/messages/messages_es_ES.properties

 secure.username.valid = Username is perfect!
 secure.realName.valid = Name looks great
 
+
+signin.error=Los datos son incorrectos.
+signin.error.description = Porfavor prueba otra vez o
+signin.error.signup = crea una cuenta
+signin.error.free = gratuitamente.
+signin.username = Nombre de Usuario
+signin.password = Contraseña
+signin.forgot = Olvidate tu contraseña?
+signin.signup = Necesitas una cuenta?
+signin.social.message = Ya tienes cuenta en alguno de estos sitios? Clickea en el logo e inicia sesión con ella.
+
+forgot.username = Escriba su nombre de usuario o correo electrónico
+forgot.submit = Recuperar mi contraseña
+
 #######################
 # Notification Messages
 #######################

encuestame-war/src/main/webapp/WEB-INF/spring/encuestame-security-context.xml

         <property name="publicKey" value="6LeytMUSAAAAAF84VURfI3TmYFEBLMLvyk5-zTxc" />
         <property name="includeNoscript" value="false" />
         <!-- po ssl -->
-        <property name="recaptchaServer" value="https://api-secure.recaptcha.net" />
+        <property name="recaptchaServer" value="http://api-secure.recaptcha.net" />
     </bean>
 
     <!-- Enable OAuth Security. <import resource="encuestame-security-oauth-context.xml"/> -->

encuestame-war/src/main/webapp/WEB-INF/views/user/web/forgot.jsp

-    <div id="mainUserWrapper">
-        <div class="form">
-            <form:form modelAttribute="unitForgotPassword">
-                    <div class="data">
-                        <div class="form-pair">
-                            <div class="form-item">
-                                <label for="email">Email</label>
-                            </div>
-                            <div class="form-value">
-                                <form:input path="email" size="30" maxlength="25" /><br /><form:errors path="email" cssClass="errors" />
-                             </div>
-                        </div>
-                    </div>
-                    <div class="recaptcha">
-                        <c:out value="${unitForgotPassword.captcha}" escapeXml="false" />
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp"%>
+
+<div id="web-login-container">
+    <form:form modelAttribute="forgotPasswordBean">
+        <div class="section-wrapper">
+            <label class="section-wrapper" for="j_username">
+                 <spring:message code="forgot.username" />:
+             </label>
+            <div class="login-section-wrapper">
+                <fieldset>
+                    <form:input path="email" size="30" maxlength="25" /><br /><form:errors path="email" cssClass="errors" />
+                 </fieldset>
+            </div>
+        </div>
+
+        <div class="section-wrapper">
+            <div class="">
+                 <c:out value="${forgotPasswordBean.captcha}" escapeXml="false" />
                         <br /><form:errors path="captcha" cssClass="error" />
-                    </div>
-                    <div class="form-submit-buttons">
-                        <input type="submit" class="input-submit" name="submit" value="Submit" />
-                    </div>
-            </form:form>
-             <a href="<%=request.getContextPath()%>/user/signin">Sign In</a>
+                 </div>
+        </div>
+        <div class="section-wrapper loginButtonWrapper">
+            <div class="login-buton">
+                <input type="submit" class="btn grey defaultButton" name="submit" value="<spring:message code="forgot.submit" />" />
+            </div>
         </div>
-    </div>
+    </form:form>
+</div>

encuestame-war/src/main/webapp/WEB-INF/views/user/web/signin.jsp

-<%@ taglib uri="http://www.springframework.org/tags" prefix="s" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
- <div id="web-login-wrapper" class="enme-auto-center">
-   <div class="web-form-wrapper" >
-       <c:if test="${not empty message}">
-            <div class="${message.infoType.css}">${message.message}</div>
-       </c:if>
-       <c:if test="${signinError}">
-          <div class="error">
-          Your sign in information was incorrect.<br/>
-          Please try again or <a href="<c:url value="/user/signup" />">sign up</a> free.
-          </div>
-      </c:if>
-      <div class="loginTitle defaultSectionTitle">Log in</div>
-       <form class="form" name="loginForm" id="loginForm"
-             action="<%=request.getContextPath()%>/user/signin/authenticate"
-             method="post">
-              <div class="field">
-              <div class="label">Username</div>
-              <div class="output">
-                 <input type="text" name="j_username" id="j_username"/></div>
-              </div>
-              <div class="field">
-              <div class="label">Password</div>
-              <div class="output">
-                <span><input type="password" name="j_password" id="j_password" /></span>
-                <span><a href="<%=request.getContextPath()%>/user/forgot">Forgot?</a></span>
-              </div>
-              </div>
-              <div class="field">
-                 <div class="label"></div>
-                  <div class="output">
-                      <input id="remember"  type="checkbox" name="_rememberMeServices" />
-                      <span>Keep me logged in</span>
-                  </div>
-               </div>
-                <div class="signIn">
-                    <input class="btn grey defaultButton" type="submit" value="Sign In" />
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp"%>
+
+<div id="web-login-container">
+    <form class="form" name="loginForm" id="loginForm"
+        action="<%=request.getContextPath()%>/user/signin/authenticate"
+        method="post">
+        <div class="section-wrapper">
+            <c:if test="${not empty message}">
+                <div class="${message.infoType.css}">${message.message}</div>
+            </c:if>
+            <c:if test="${signinError}">
+                <div class="error">
+                    <spring:message code="signin.error" /><br />
+                     <spring:message code="signin.error.description" />
+                     <a href="<c:url value="/user/signup" />">
+                       <spring:message code="signin.error.signup" /> <spring:message code="signin.error.free" />
+                     </a>
+
                 </div>
-        </form>
-        <div class="singup">
-           <span >
-                New User? <a href="<%=request.getContextPath()%>/user/signup"><span>Sign Up</span></a> for free
-           </span>
+            </c:if>
         </div>
-         <c:if test="${social}">
-              <div class="web-social-signin">
-                  <div class="title">Select one of these thrid-party accouns to sign in</div>
-                  <%@ include file="/WEB-INF/jsp/includes/web/social.jsp" %>
+
+
+        <div class="section-wrapper">
+            <label class="section-wrapper" for="j_username">
+                 <spring:message code="signin.username" />:
+             </label>
+            <div class="login-section-wrapper">
+                <fieldset>
+                    <input type="text" name="j_username" id="j_username" />
+                 </fieldset>
+            </div>
+        </div>
+
+        <div class="section-wrapper">
+            <label class="section-wrapper" for="j_password">
+                <spring:message code="signin.password" />:
+             </label>
+            <div class="login-section-wrapper">
+                <fieldset>
+                    <input type="password" name="j_password" id="j_password" />
+                </fieldset>
+            </div>
+            <div class="forgot">
+                 <a href="<%=request.getContextPath()%>/user/forgot">
+                    <spring:message code="signin.forgot" />
+                 </a>
+            </div>
+        </div>
+        <div class="section-wrapper loginButtonWrapper">
+            <div class="login-buton">
+                <input class="btn grey defaultButton" type="submit"
+                       value="Iniciar sesi�n" name="loginButton" id="loginButton">
+            </div>
+            <div class="signup">
+                  <a href="<%=request.getContextPath()%>/user/signup">
+                    <spring:message code="signin.signup" />
+                  </a>
+            </div>
+        </div>
+
+        <div class="section-wrapper">
+           <c:if test="${social}">
+                <div class="web-social-signin">
+                    <div class="title">
+                        <spring:message code="signin.social.message" />
+                    </div>
+                    <%@ include file="/WEB-INF/jsp/includes/web/social.jsp"%>
                 </div>
-          </c:if>
-    </div>
+           </c:if>
+        </div>
+    </form>
 </div>

encuestame-war/src/main/webapp/WEB-INF/wro.xml

     <css>/resource/css/web/table.css</css>
     <css>/resource/css/web/user.css</css>
     <css>/resource/css/common.css</css>
+    <css>/resource/css/reset.css</css>
+    <css>/resource/css/web/layout.css</css>
   </group>
   <group name='mobile'>
     <css>/resource/css/mobile/default.css</css>
     <css>/resource/css/common.css</css>
+    <css>/resource/css/reset.css</css>
+    <css>/resource/css/mobile/layout.css</css>
   </group>
 </groups>

encuestame-war/src/main/webapp/resource/css/common.css

 .btn-default {
     display: inline-block;
-    background: url(btn.bg.png) repeat-x 0px 0px;
     padding:5px 10px 6px 10px;
     font-weight: normal;
     text-shadow: 1px 1px 1px rgba(255,255,255,0.5);

encuestame-war/src/main/webapp/resource/css/web/admon.css

-@import url("project.css");
 
 /* Templates Admon */
 

encuestame-war/src/main/webapp/resource/css/web/button.css

 /* CSS3 BUTTON */
 .btn {
     display: inline-block;
-    background: url(btn.bg.png) repeat-x 0px 0px;
     padding: 5px 10px 6px 10px;
     font-weight: bold;
-    text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.5);
     border: 1px solid rgba(0, 0, 0, 0.4);
     -moz-border-radius: 5px;
-    -moz-box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5);
     -webkit-border-radius: 5px;
-    -webkit-box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5);
     font-size: 12px;
 }
 
 }
 
 .grey {
-    background-color: #CCCCCC;
+    background-color: #EEEEEE;
     color: #141414;
 }
 

encuestame-war/src/main/webapp/resource/css/web/default.css

 /** common classes **/
 
 .error{
-    background-color: #C88080;
+    background-color: #E39393;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
 
 .defaultButton{
    margin-left : 8px;
-   border: 1px solid #BCBCBC;
+   border: 1px solid #C1C1C1;
    min-width: 100px;
    padding: 4px;
    cursor: pointer;

encuestame-war/src/main/webapp/resource/css/web/public.css

     color: #12122D;
 }
 
-.tags a:visited {
-    color: #12122D;
-}
-
 .tag:hover {
     color: #F7FBFF;
     background-color: #3E6D8E;
     white-space: nowrap;
 }
 
-/*** login **/
-#web-login-wrapper {
-    margin: 5em auto;
-    width: 45em;
-    z-index: 1;
-}
 
-#web-login-wrapper div.loginTitle {
-    padding-left: 10px;
-}
-
-#web-login-wrapper div.signIn {
-    margin: 0 auto;
-    padding: 3px;
-    width: 11em;
-}
+/** login **/
 
-#web-login-wrapper div.field {
-    padding: 10px;
+#web-login-container {
+    border-left-width: 1px;
+    border-right-width: 1px;
+    margin: 0 200px;
+    min-width: 400px;
+    padding-top: 80px;
+    width: 50%;
 }
 
-#web-login-wrapper div.forgotPassword {
-    font-size: 10px;
-    float: left;
-    margin-left: 100px;
+#web-login-container .section-wrapper a:link{
+    color: #000 !important;
+    text-decoration: none !important;
 }
 
-#web-login-wrapper div.forgotPassword a {
-    color: #000;
-    text-decoration: none;
+#web-login-container .section-wrapper {
+    margin: 0 auto;
+    padding-top: 15px;
+    text-align: left;
+    width: 60%;
+    position: relative;
 }
 
-#web-login-wrapper div.forgotPassword a:hover {
-    color: #000;
-    text-decoration: underline;
+.login-section-wrapper {
+    background: -moz-linear-gradient(center top, #F0F0F2, #FFFFFF) repeat
+        scroll 0 0 transparent;
+    border: 1px solid #CCCCCC;
+    border-radius: 7px 7px 7px 7px;
+    box-shadow: 0 1px #FFFFFF;
+    display: block;
+    height: 27px;
+    line-height: 27px;
+    margin-top: 6px;
+    position: relative;
+    width: 100%;
 }
 
-#web-login-wrapper div.field div.label {
-    color: #000;
-    float: left;
-    font-size: 133%;
-    padding-top: 6px;
-    width: 90px;
+#web-login-container .section-wrapper label {
+    font-size: 12px;
+    left: 8px;
 }
 
-#web-login-wrapper  input[type="text"] {
-    height: 20px;
-    width: 275px;
-    font-size: 16px;
-    font-weight: normal;
-    border-radius: 3px 3px 3px 3px;
-    -webkit-border-radius: 3px 3px 3px 3px;
-    -moz-border-radius: 3px 3px 3px 3px;
-    padding: 4px 2px;
-    border: 1px solid #AAAAAA;
+.section-shadow-wrapper {
+    text-shadow: 0 1px #FFFFFF;
 }
 
-#web-login-wrapper div.field div.output label {
-    margin-left: 90px;
+.login-section-wrapper fieldset {
+    left: 10px;
+    position: absolute;
+    right: 10px;
 }
 
-#web-login-wrapper  input[type="password"] {
-    height: 20px;
-    width: 275px;
-    font-size: 16px;
-    font-weight: normal;
-    border-radius: 3px 3px 3px 3px;
-    -webkit-border-radius: 3px 3px 3px 3px;
-    -moz-border-radius: 3px 3px 3px 3px;
-    padding: 4px 2px;
-    border: 1px solid #AAAAAA;
+#web-login-container .forgot {
+  left: 342px;
+  position: relative;
+  top: -20px;
 }
 
-#web-login-wrapper div.field div.output span a {
-    font-size: 10px;
-    text-decoration: none;
-    padding-left: 5px;
+#web-login-container .signup {
+  left: 225px;
+  position: relative;
+  text-align: left;
+  top: -19px;
 }
 
-#web-login-wrapper div.buttonGroup {
-    margin-left: 95px;
-    margin-top: 25px;
+.login-section-wrapper fieldset input {
+    background: none repeat scroll 0 0 transparent;
+    border: 0 none;
+    color: #7E7E7E;
+    font-size: 13px;
+    font-weight: inherit;
+    height: 19px;
+    line-height: 19px;
+    position: relative;
+    width: 100%;
 }
 
-#web-login-wrapper div.web-form-wrapper {
-    float: left;
-    min-width: 440px;
-    border-radius: 3px 3px 3px 3px;
-    -webkit-border-radius: 3px 3px 3px 3px;
-    -moz-border-radius: 3px 3px 3px 3px;
-    background-color: #F9F9F9;
-    border: 1px solid #8BA0BC;
+#web-login-container .loginButtonWrapper {
+  padding-top: 25px;
+  text-align: center;
 }
 
-#web-login-wrapper div.singup {
-    text-align: center;
-    padding: 10px;
-    font-size: 120%;
-}
+#web-login-container .web-social-signin {
 
-#web-login-wrapper div.web-social-signin {
-    border-top: 1px dotted gray;
-    max-width: 400px;
-    min-width: 350px;
-    padding: 10px;
-    margin: 10px;
 }
 
-#web-login-wrapper div.web-social-signin .title {
-    color: #000000;
-    font-size: 100%;
-    font-weight: bold;
-    padding-bottom: 10px;
+#web-login-container .web-social-signin .title {
+  color: #919090;
+  font-size: 13px;
+  margin-bottom: 10px;
 }
 
-#web-login-wrapper div.web-social-signin .section {
-    padding: 4px;
-}
+/** form wrapper */
 
 div.web-form-wrapper a.button {
     color: #444;
     text-decoration: none;
 }
 
-div.addAnswers div.answerItem div.title .answerItemShortUrl a:visited {
-    color: #FFF;
-}
-
 div.addAnswers div.answerItem div.title .answerItemShortUrl a:hover {
     text-decoration: none;
 }
     color: #FFF;
 }
 
-div.wrapperHashTagItems div.addNewHashTag .hashTagItem a:visited {
-    color: #FFF;
-    text-decoration: none;
-}
-
 div.wrapperHashTagItems div.addNewHashTag .hashTagItem a:hover {
     color: #FFF;
     text-decoration: none;
     font-weight: normal;
 }
 
-div..menuWrapper .item a:visited {
-    color: #FFFFFF;
-}
-
 div..menuWrapper .item a:hover,.menuWrapper .item .current {
     color: #444444;
     background-color: #E8E8E8;

encuestame-war/src/main/webapp/resource/js/encuestame/org/core/commons/poll/templates/pollNavigate.html

     <div id="tweetListContent" class="tweetListContent">
         <aside style="float: left; width: 200px; border: 1px solid #E6E6E6;">
             <div class="web-sidebar-options">
-                <div id="strapline">ssssssssssssssssss</div>
+                <div id="strapline"></div>
                 <div class="web-filter-sidebar-panel">
                     <div class="folder-title default-background-dark-color default-sidebar-menu">Filters</div>
                     <div class="optionItem" dojoAttachEvent="onclick:_searchByAccount"

encuestame-war/src/main/webapp/resource/js/modernizr-2.0.6.js

-/*!
- * Modernizr v2.0.6
- * http://www.modernizr.com
- *
- * Copyright (c) 2009-2011 Faruk Ates, Paul Irish, Alex Sexton
- * Dual-licensed under the BSD or MIT licenses: www.modernizr.com/license/
- */
-
-/*
- * Modernizr tests which native CSS3 and HTML5 features are available in
- * the current UA and makes the results available to you in two ways:
- * as properties on a global Modernizr object, and as classes on the
- * <html> element. This information allows you to progressively enhance
- * your pages with a granular level of control over the experience.
- *
- * Modernizr has an optional (not included) conditional resource loader
- * called Modernizr.load(), based on Yepnope.js (yepnopejs.com).
- * To get a build that includes Modernizr.load(), as well as choosing
- * which tests to include, go to www.modernizr.com/download/
- *
- * Authors        Faruk Ates, Paul Irish, Alex Sexton, 
- * Contributors   Ryan Seddon, Ben Alman
- */
-
-window.Modernizr = (function( window, document, undefined ) {
-
-    var version = '2.0.6',
-
-    Modernizr = {},
-    
-    // option for enabling the HTML classes to be added
-    enableClasses = true,
-
-    docElement = document.documentElement,
-    docHead = document.head || document.getElementsByTagName('head')[0],
-
-    /**
-     * Create our "modernizr" element that we do most feature tests on.
-     */
-    mod = 'modernizr',
-    modElem = document.createElement(mod),
-    mStyle = modElem.style,
-
-    /**
-     * Create the input element for various Web Forms feature tests.
-     */
-    inputElem = document.createElement('input'),
-
-    smile = ':)',
-
-    toString = Object.prototype.toString,
-
-    // List of property values to set for css tests. See ticket #21
-    prefixes = ' -webkit- -moz- -o- -ms- -khtml- '.split(' '),
-
-    // Following spec is to expose vendor-specific style properties as:
-    //   elem.style.WebkitBorderRadius
-    // and the following would be incorrect:
-    //   elem.style.webkitBorderRadius
-
-    // Webkit ghosts their properties in lowercase but Opera & Moz do not.
-    // Microsoft foregoes prefixes entirely <= IE8, but appears to
-    //   use a lowercase `ms` instead of the correct `Ms` in IE9
-
-    // More here: http://github.com/Modernizr/Modernizr/issues/issue/21
-    domPrefixes = 'Webkit Moz O ms Khtml'.split(' '),
-
-    ns = {'svg': 'http://www.w3.org/2000/svg'},
-
-    tests = {},
-    inputs = {},
-    attrs = {},
-
-    classes = [],
-
-    featureName, // used in testing loop
-
-
-    // Inject element with style element and some CSS rules
-    injectElementWithStyles = function( rule, callback, nodes, testnames ) {
-
-      var style, ret, node,
-          div = document.createElement('div');
-
-      if ( parseInt(nodes, 10) ) {
-          // In order not to give false positives we create a node for each test
-          // This also allows the method to scale for unspecified uses
-          while ( nodes-- ) {
-              node = document.createElement('div');
-              node.id = testnames ? testnames[nodes] : mod + (nodes + 1);
-              div.appendChild(node);
-          }
-      }
-
-      // <style> elements in IE6-9 are considered 'NoScope' elements and therefore will be removed
-      // when injected with innerHTML. To get around this you need to prepend the 'NoScope' element
-      // with a 'scoped' element, in our case the soft-hyphen entity as it won't mess with our measurements.
-      // http://msdn.microsoft.com/en-us/library/ms533897%28VS.85%29.aspx
-      style = ['&shy;', '<style>', rule, '</style>'].join('');
-      div.id = mod;
-      div.innerHTML += style;
-      docElement.appendChild(div);
-
-      ret = callback(div, rule);
-      div.parentNode.removeChild(div);
-
-      return !!ret;
-
-    },
-
-
-    // adapted from matchMedia polyfill
-    // by Scott Jehl and Paul Irish
-    // gist.github.com/786768
-    testMediaQuery = function( mq ) {
-
-      if ( window.matchMedia ) {
-        return matchMedia(mq).matches;
-      }
-
-      var bool;
-
-      injectElementWithStyles('@media ' + mq + ' { #' + mod + ' { position: absolute; } }', function( node ) {
-        bool = (window.getComputedStyle ?
-                  getComputedStyle(node, null) :
-                  node.currentStyle)['position'] == 'absolute';
-      });
-
-      return bool;
-
-     },
-
-
-    /**
-      * isEventSupported determines if a given element supports the given event
-      * function from http://yura.thinkweb2.com/isEventSupported/
-      */
-    isEventSupported = (function() {
-
-      var TAGNAMES = {
-        'select': 'input', 'change': 'input',
-        'submit': 'form', 'reset': 'form',
-        'error': 'img', 'load': 'img', 'abort': 'img'
-      };
-
-      function isEventSupported( eventName, element ) {
-
-        element = element || document.createElement(TAGNAMES[eventName] || 'div');
-        eventName = 'on' + eventName;
-
-        // When using `setAttribute`, IE skips "unload", WebKit skips "unload" and "resize", whereas `in` "catches" those
-        var isSupported = eventName in element;
-
-        if ( !isSupported ) {
-          // If it has no `setAttribute` (i.e. doesn't implement Node interface), try generic element
-          if ( !element.setAttribute ) {
-            element = document.createElement('div');
-          }
-          if ( element.setAttribute && element.removeAttribute ) {
-            element.setAttribute(eventName, '');
-            isSupported = is(element[eventName], 'function');
-
-            // If property was created, "remove it" (by setting value to `undefined`)
-            if ( !is(element[eventName], undefined) ) {
-              element[eventName] = undefined;
-            }
-            element.removeAttribute(eventName);
-          }
-        }
-
-        element = null;
-        return isSupported;
-      }
-      return isEventSupported;
-    })();
-
-    // hasOwnProperty shim by kangax needed for Safari 2.0 support
-    var _hasOwnProperty = ({}).hasOwnProperty, hasOwnProperty;
-    if ( !is(_hasOwnProperty, undefined) && !is(_hasOwnProperty.call, undefined) ) {
-      hasOwnProperty = function (object, property) {
-        return _hasOwnProperty.call(object, property);
-      };
-    }
-    else {
-      hasOwnProperty = function (object, property) { /* yes, this can give false positives/negatives, but most of the time we don't care about those */
-        return ((property in object) && is(object.constructor.prototype[property], undefined));
-      };
-    }
-
-    /**
-     * setCss applies given styles to the Modernizr DOM node.
-     */
-    function setCss( str ) {
-        mStyle.cssText = str;
-    }
-
-    /**
-     * setCssAll extrapolates all vendor-specific css strings.
-     */
-    function setCssAll( str1, str2 ) {
-        return setCss(prefixes.join(str1 + ';') + ( str2 || '' ));
-    }
-
-    /**
-     * is returns a boolean for if typeof obj is exactly type.
-     */
-    function is( obj, type ) {
-        return typeof obj === type;
-    }
-
-    /**
-     * contains returns a boolean for if substr is found within str.
-     */
-    function contains( str, substr ) {
-        return !!~('' + str).indexOf(substr);
-    }
-
-    /**
-     * testProps is a generic CSS / DOM property test; if a browser supports
-     *   a certain property, it won't return undefined for it.
-     *   A supported CSS property returns empty string when its not yet set.
-     */
-    function testProps( props, prefixed ) {
-        for ( var i in props ) {
-            if ( mStyle[ props[i] ] !== undefined ) {
-                return prefixed == 'pfx' ? props[i] : true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * testPropsAll tests a list of DOM properties we want to check against.
-     *   We specify literally ALL possible (known and/or likely) properties on
-     *   the element including the non-vendor prefixed one, for forward-
-     *   compatibility.
-     */
-    function testPropsAll( prop, prefixed ) {
-
-        var ucProp  = prop.charAt(0).toUpperCase() + prop.substr(1),
-            props   = (prop + ' ' + domPrefixes.join(ucProp + ' ') + ucProp).split(' ');
-
-        return testProps(props, prefixed);
-    }
-
-    /**
-     * testBundle tests a list of CSS features that require element and style injection.
-     *   By bundling them together we can reduce the need to touch the DOM multiple times.
-     */
-    /*>>testBundle*/
-    var testBundle = (function( styles, tests ) {
-        var style = styles.join(''),
-            len = tests.length;
-
-        injectElementWithStyles(style, function( node, rule ) {
-            var style = document.styleSheets[document.styleSheets.length - 1],
-                // IE8 will bork if you create a custom build that excludes both fontface and generatedcontent tests.
-                // So we check for cssRules and that there is a rule available
-                // More here: https://github.com/Modernizr/Modernizr/issues/288 & https://github.com/Modernizr/Modernizr/issues/293
-                cssText = style.cssRules && style.cssRules[0] ? style.cssRules[0].cssText : style.cssText || "",
-                children = node.childNodes, hash = {};
-
-            while ( len-- ) {
-                hash[children[len].id] = children[len];
-            }
-
-            /*>>touch*/           Modernizr['touch'] = ('ontouchstart' in window) || hash['touch'].offsetTop === 9; /*>>touch*/
-            /*>>csstransforms3d*/ Modernizr['csstransforms3d'] = hash['csstransforms3d'].offsetLeft === 9;          /*>>csstransforms3d*/
-            /*>>generatedcontent*/Modernizr['generatedcontent'] = hash['generatedcontent'].offsetHeight >= 1;       /*>>generatedcontent*/
-            /*>>fontface*/        Modernizr['fontface'] = /src/i.test(cssText) &&
-                                                                  cssText.indexOf(rule.split(' ')[0]) === 0;        /*>>fontface*/
-        }, len, tests);
-
-    })([
-        // Pass in styles to be injected into document
-        /*>>fontface*/        '@font-face {font-family:"font";src:url("https://")}'         /*>>fontface*/
-        
-        /*>>touch*/           ,['@media (',prefixes.join('touch-enabled),('),mod,')',
-                                '{#touch{top:9px;position:absolute}}'].join('')           /*>>touch*/
-                                
-        /*>>csstransforms3d*/ ,['@media (',prefixes.join('transform-3d),('),mod,')',
-                                '{#csstransforms3d{left:9px;position:absolute}}'].join('')/*>>csstransforms3d*/
-                                
-        /*>>generatedcontent*/,['#generatedcontent:after{content:"',smile,'";visibility:hidden}'].join('')  /*>>generatedcontent*/
-    ],
-      [
-        /*>>fontface*/        'fontface'          /*>>fontface*/
-        /*>>touch*/           ,'touch'            /*>>touch*/
-        /*>>csstransforms3d*/ ,'csstransforms3d'  /*>>csstransforms3d*/
-        /*>>generatedcontent*/,'generatedcontent' /*>>generatedcontent*/
-        
-    ]);/*>>testBundle*/
-
-
-    /**
-     * Tests
-     * -----
-     */
-
-    tests['flexbox'] = function() {
-        /**
-         * setPrefixedValueCSS sets the property of a specified element
-         * adding vendor prefixes to the VALUE of the property.
-         * @param {Element} element
-         * @param {string} property The property name. This will not be prefixed.
-         * @param {string} value The value of the property. This WILL be prefixed.
-         * @param {string=} extra Additional CSS to append unmodified to the end of
-         * the CSS string.
-         */
-        function setPrefixedValueCSS( element, property, value, extra ) {
-            property += ':';
-            element.style.cssText = (property + prefixes.join(value + ';' + property)).slice(0, -property.length) + (extra || '');
-        }
-
-        /**
-         * setPrefixedPropertyCSS sets the property of a specified element
-         * adding vendor prefixes to the NAME of the property.
-         * @param {Element} element
-         * @param {string} property The property name. This WILL be prefixed.
-         * @param {string} value The value of the property. This will not be prefixed.
-         * @param {string=} extra Additional CSS to append unmodified to the end of
-         * the CSS string.
-         */
-        function setPrefixedPropertyCSS( element, property, value, extra ) {
-            element.style.cssText = prefixes.join(property + ':' + value + ';') + (extra || '');
-        }
-
-        var c = document.createElement('div'),
-            elem = document.createElement('div');
-
-        setPrefixedValueCSS(c, 'display', 'box', 'width:42px;padding:0;');
-        setPrefixedPropertyCSS(elem, 'box-flex', '1', 'width:10px;');
-
-        c.appendChild(elem);
-        docElement.appendChild(c);
-
-        var ret = elem.offsetWidth === 42;
-
-        c.removeChild(elem);
-        docElement.removeChild(c);
-
-        return ret;
-    };
-
-    // On the S60 and BB Storm, getContext exists, but always returns undefined
-    // http://github.com/Modernizr/Modernizr/issues/issue/97/
-
-    tests['canvas'] = function() {
-        var elem = document.createElement('canvas');
-        return !!(elem.getContext && elem.getContext('2d'));
-    };
-
-    tests['canvastext'] = function() {
-        return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function'));
-    };
-
-    // This WebGL test may false positive. 
-    // But really it's quite impossible to know whether webgl will succeed until after you create the context. 
-    // You might have hardware that can support a 100x100 webgl canvas, but will not support a 1000x1000 webgl 
-    // canvas. So this feature inference is weak, but intentionally so.
-    
-    // It is known to false positive in FF4 with certain hardware and the iPad 2.
-    
-    tests['webgl'] = function() {
-        return !!window.WebGLRenderingContext;
-    };
-
-    /*
-     * The Modernizr.touch test only indicates if the browser supports
-     *    touch events, which does not necessarily reflect a touchscreen
-     *    device, as evidenced by tablets running Windows 7 or, alas,
-     *    the Palm Pre / WebOS (touch) phones.
-     *
-     * Additionally, Chrome (desktop) used to lie about its support on this,
-     *    but that has since been rectified: http://crbug.com/36415
-     *
-     * We also test for Firefox 4 Multitouch Support.
-     *
-     * For more info, see: http://modernizr.github.com/Modernizr/touch.html
-     */
-
-    tests['touch'] = function() {
-        return Modernizr['touch'];
-    };
-
-    /**
-     * geolocation tests for the new Geolocation API specification.
-     *   This test is a standards compliant-only test; for more complete
-     *   testing, including a Google Gears fallback, please see:
-     *   http://code.google.com/p/geo-location-javascript/
-     * or view a fallback solution using google's geo API:
-     *   http://gist.github.com/366184
-     */
-    tests['geolocation'] = function() {
-        return !!navigator.geolocation;
-    };
-
-    // Per 1.6:
-    // This used to be Modernizr.crosswindowmessaging but the longer
-    // name has been deprecated in favor of a shorter and property-matching one.
-    // The old API is still available in 1.6, but as of 2.0 will throw a warning,
-    // and in the first release thereafter disappear entirely.
-    tests['postmessage'] = function() {
-      return !!window.postMessage;
-    };
-
-    // Web SQL database detection is tricky:
-
-    // In chrome incognito mode, openDatabase is truthy, but using it will
-    //   throw an exception: http://crbug.com/42380
-    // We can create a dummy database, but there is no way to delete it afterwards.
-
-    // Meanwhile, Safari users can get prompted on any database creation.
-    //   If they do, any page with Modernizr will give them a prompt:
-    //   http://github.com/Modernizr/Modernizr/issues/closed#issue/113
-
-    // We have chosen to allow the Chrome incognito false positive, so that Modernizr
-    //   doesn't litter the web with these test databases. As a developer, you'll have
-    //   to account for this gotcha yourself.
-    tests['websqldatabase'] = function() {
-      var result = !!window.openDatabase;
-      /*  if (result){
-            try {
-              result = !!openDatabase( mod + "testdb", "1.0", mod + "testdb", 2e4);
-            } catch(e) {
-            }
-          }  */
-      return result;
-    };
-
-    // Vendors had inconsistent prefixing with the experimental Indexed DB:
-    // - Webkit's implementation is accessible through webkitIndexedDB
-    // - Firefox shipped moz_indexedDB before FF4b9, but since then has been mozIndexedDB
-    // For speed, we don't test the legacy (and beta-only) indexedDB
-    tests['indexedDB'] = function() {
-      for ( var i = -1, len = domPrefixes.length; ++i < len; ){
-        if ( window[domPrefixes[i].toLowerCase() + 'IndexedDB'] ){
-          return true;
-        }
-      }
-      return !!window.indexedDB;
-    };
-
-    // documentMode logic from YUI to filter out IE8 Compat Mode
-    //   which false positives.
-    tests['hashchange'] = function() {
-      return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7);
-    };
-
-    // Per 1.6:
-    // This used to be Modernizr.historymanagement but the longer
-    // name has been deprecated in favor of a shorter and property-matching one.
-    // The old API is still available in 1.6, but as of 2.0 will throw a warning,
-    // and in the first release thereafter disappear entirely.
-    tests['history'] = function() {
-      return !!(window.history && history.pushState);
-    };
-
-    tests['draganddrop'] = function() {
-        return isEventSupported('dragstart') && isEventSupported('drop');
-    };
-
-    // Mozilla is targeting to land MozWebSocket for FF6
-    // bugzil.la/659324
-    tests['websockets'] = function() {
-        for ( var i = -1, len = domPrefixes.length; ++i < len; ){
-          if ( window[domPrefixes[i] + 'WebSocket'] ){
-            return true;
-          }
-        }
-        return 'WebSocket' in window;
-    };
-
-
-    // http://css-tricks.com/rgba-browser-support/
-    tests['rgba'] = function() {
-        // Set an rgba() color and check the returned value
-
-        setCss('background-color:rgba(150,255,150,.5)');
-
-        return contains(mStyle.backgroundColor, 'rgba');
-    };
-
-    tests['hsla'] = function() {
-        // Same as rgba(), in fact, browsers re-map hsla() to rgba() internally,
-        //   except IE9 who retains it as hsla
-
-        setCss('background-color:hsla(120,40%,100%,.5)');
-
-        return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla');
-    };
-
-    tests['multiplebgs'] = function() {
-        // Setting multiple images AND a color on the background shorthand property
-        //  and then querying the style.background property value for the number of
-        //  occurrences of "url(" is a reliable method for detecting ACTUAL support for this!
-
-        setCss('background:url(https://),url(https://),red url(https://)');
-
-        // If the UA supports multiple backgrounds, there should be three occurrences
-        //   of the string "url(" in the return value for elemStyle.background
-
-        return /(url\s*\(.*?){3}/.test(mStyle.background);
-    };
-
-
-    // In testing support for a given CSS property, it's legit to test:
-    //    `elem.style[styleName] !== undefined`
-    // If the property is supported it will return an empty string,
-    // if unsupported it will return undefined.
-
-    // We'll take advantage of this quick test and skip setting a style
-    // on our modernizr element, but instead just testing undefined vs
-    // empty string.
-
-
-    tests['backgroundsize'] = function() {
-        return testPropsAll('backgroundSize');
-    };
-
-    tests['borderimage'] = function() {
-        return testPropsAll('borderImage');
-    };
-
-
-    // Super comprehensive table about all the unique implementations of
-    // border-radius: http://muddledramblings.com/table-of-css3-border-radius-compliance
-
-    tests['borderradius'] = function() {
-        return testPropsAll('borderRadius');
-    };
-
-    // WebOS unfortunately false positives on this test.
-    tests['boxshadow'] = function() {
-        return testPropsAll('boxShadow');
-    };
-
-    // FF3.0 will false positive on this test
-    tests['textshadow'] = function() {
-        return document.createElement('div').style.textShadow === '';
-    };
-
-
-    tests['opacity'] = function() {
-        // Browsers that actually have CSS Opacity implemented have done so
-        //  according to spec, which means their return values are within the
-        //  range of [0.0,1.0] - including the leading zero.
-
-        setCssAll('opacity:.55');
-
-        // The non-literal . in this regex is intentional:
-        //   German Chrome returns this value as 0,55
-        // https://github.com/Modernizr/Modernizr/issues/#issue/59/comment/516632
-        return /^0.55$/.test(mStyle.opacity);
-    };
-
-
-    tests['cssanimations'] = function() {
-        return testPropsAll('animationName');
-    };
-
-
-    tests['csscolumns'] = function() {
-        return testPropsAll('columnCount');
-    };
-
-
-    tests['cssgradients'] = function() {
-        /**
-         * For CSS Gradients syntax, please see:
-         * http://webkit.org/blog/175/introducing-css-gradients/
-         * https://developer.mozilla.org/en/CSS/-moz-linear-gradient
-         * https://developer.mozilla.org/en/CSS/-moz-radial-gradient
-         * http://dev.w3.org/csswg/css3-images/#gradients-
-         */
-
-        var str1 = 'background-image:',
-            str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));',
-            str3 = 'linear-gradient(left top,#9f9, white);';
-
-        setCss(
-            (str1 + prefixes.join(str2 + str1) + prefixes.join(str3 + str1)).slice(0, -str1.length)
-        );
-
-        return contains(mStyle.backgroundImage, 'gradient');
-    };
-
-
-    tests['cssreflections'] = function() {
-        return testPropsAll('boxReflect');
-    };
-
-
-    tests['csstransforms'] = function() {
-        return !!testProps(['transformProperty', 'WebkitTransform', 'MozTransform', 'OTransform', 'msTransform']);
-    };
-
-
-    tests['csstransforms3d'] = function() {
-
-        var ret = !!testProps(['perspectiveProperty', 'WebkitPerspective', 'MozPerspective', 'OPerspective', 'msPerspective']);
-
-        // Webkit’s 3D transforms are passed off to the browser's own graphics renderer.
-        //   It works fine in Safari on Leopard and Snow Leopard, but not in Chrome in
-        //   some conditions. As a result, Webkit typically recognizes the syntax but
-        //   will sometimes throw a false positive, thus we must do a more thorough check:
-        if ( ret && 'webkitPerspective' in docElement.style ) {
-
-          // Webkit allows this media query to succeed only if the feature is enabled.
-          // `@media (transform-3d),(-o-transform-3d),(-moz-transform-3d),(-ms-transform-3d),(-webkit-transform-3d),(modernizr){ ... }`
-          ret = Modernizr['csstransforms3d'];
-        }
-        return ret;
-    };
-
-
-    tests['csstransitions'] = function() {
-        return testPropsAll('transitionProperty');
-    };
-
-
-    /*>>fontface*/
-    // @font-face detection routine by Diego Perini
-    // http://javascript.nwbox.com/CSSSupport/
-    tests['fontface'] = function() {
-        return Modernizr['fontface'];
-    };
-    /*>>fontface*/
-
-    // CSS generated content detection
-    tests['generatedcontent'] = function() {
-        return Modernizr['generatedcontent'];
-    };
-
-
-
-    // These tests evaluate support of the video/audio elements, as well as
-    // testing what types of content they support.
-    //
-    // We're using the Boolean constructor here, so that we can extend the value
-    // e.g.  Modernizr.video     // true
-    //       Modernizr.video.ogg // 'probably'
-    //
-    // Codec values from : http://github.com/NielsLeenheer/html5test/blob/9106a8/index.html#L845
-    //                     thx to NielsLeenheer and zcorpan
-
-    // Note: in FF 3.5.1 and 3.5.0, "no" was a return value instead of empty string.
-    //   Modernizr does not normalize for that.
-
-    tests['video'] = function() {
-        var elem = document.createElement('video'),
-            bool = false;
-            
-        // IE9 Running on Windows Server SKU can cause an exception to be thrown, bug #224
-        try {
-            if ( bool = !!elem.canPlayType ) {
-                bool      = new Boolean(bool);
-                bool.ogg  = elem.canPlayType('video/ogg; codecs="theora"');
-
-                // Workaround required for IE9, which doesn't report video support without audio codec specified.
-                //   bug 599718 @ msft connect
-                var h264 = 'video/mp4; codecs="avc1.42E01E';
-                bool.h264 = elem.canPlayType(h264 + '"') || elem.canPlayType(h264 + ', mp4a.40.2"');
-
-                bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"');
-            }
-            
-        } catch(e) { }
-        
-        return bool;
-    };
-
-    tests['audio'] = function() {
-        var elem = document.createElement('audio'),
-            bool = false;
-
-        try { 
-            if ( bool = !!elem.canPlayType ) {
-                bool      = new Boolean(bool);
-                bool.ogg  = elem.canPlayType('audio/ogg; codecs="vorbis"');
-                bool.mp3  = elem.canPlayType('audio/mpeg;');
-
-                // Mimetypes accepted:
-                //   https://developer.mozilla.org/En/Media_formats_supported_by_the_audio_and_video_elements
-                //   http://bit.ly/iphoneoscodecs
-                bool.wav  = elem.canPlayType('audio/wav; codecs="1"');
-                bool.m4a  = elem.canPlayType('audio/x-m4a;') || elem.canPlayType('audio/aac;');
-            }
-        } catch(e) { }
-        
-        return bool;
-    };
-
-
-    // Firefox has made these tests rather unfun.
-
-    // In FF4, if disabled, window.localStorage should === null.
-
-    // Normally, we could not test that directly and need to do a
-    //   `('localStorage' in window) && ` test first because otherwise Firefox will
-    //   throw http://bugzil.la/365772 if cookies are disabled
-
-    // However, in Firefox 4 betas, if dom.storage.enabled == false, just mentioning
-    //   the property will throw an exception. http://bugzil.la/599479
-    // This looks to be fixed for FF4 Final.
-
-    // Because we are forced to try/catch this, we'll go aggressive.
-
-    // FWIW: IE8 Compat mode supports these features completely:
-    //   http://www.quirksmode.org/dom/html5.html
-    // But IE8 doesn't support either with local files
-
-    tests['localstorage'] = function() {
-        try {
-            return !!localStorage.getItem;
-        } catch(e) {
-            return false;
-        }
-    };
-
-    tests['sessionstorage'] = function() {
-        try {
-            return !!sessionStorage.getItem;
-        } catch(e){
-            return false;
-        }
-    };
-
-
-    tests['webworkers'] = function() {
-        return !!window.Worker;
-    };
-
-
-    tests['applicationcache'] = function() {
-        return !!window.applicationCache;
-    };
-
-
-    // Thanks to Erik Dahlstrom
-    tests['svg'] = function() {
-        return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect;
-    };
-
-    // specifically for SVG inline in HTML, not within XHTML
-    // test page: paulirish.com/demo/inline-svg
-    tests['inlinesvg'] = function() {
-      var div = document.createElement('div');
-      div.innerHTML = '<svg/>';
-      return (div.firstChild && div.firstChild.namespaceURI) == ns.svg;
-    };
-
-    // Thanks to F1lt3r and lucideer, ticket #35
-    tests['smil'] = function() {
-        return !!document.createElementNS && /SVG/.test(toString.call(document.createElementNS(ns.svg, 'animate')));
-    };
-
-    tests['svgclippaths'] = function() {
-        // Possibly returns a false positive in Safari 3.2?
-        return !!document.createElementNS && /SVG/.test(toString.call(document.createElementNS(ns.svg, 'clipPath')));
-    };
-
-    // input features and input types go directly onto the ret object, bypassing the tests loop.
-    // Hold this guy to execute in a moment.
-    function webforms() {
-        // Run through HTML5's new input attributes to see if the UA understands any.
-        // We're using f which is the <input> element created early on
-        // Mike Taylr has created a comprehensive resource for testing these attributes
-        //   when applied to all input types:
-        //   http://miketaylr.com/code/input-type-attr.html
-        // spec: http://www.whatwg.org/specs/web-apps/current-work/multipage/the-input-element.html#input-type-attr-summary
-        
-        // Only input placeholder is tested while textarea's placeholder is not. 
-        // Currently Safari 4 and Opera 11 have support only for the input placeholder
-        // Both tests are available in feature-detects/forms-placeholder.js
-        Modernizr['input'] = (function( props ) {
-            for ( var i = 0, len = props.length; i < len; i++ ) {
-                attrs[ props[i] ] = !!(props[i] in inputElem);
-            }
-            return attrs;
-        })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' '));
-
-        // Run through HTML5's new input types to see if the UA understands any.
-        //   This is put behind the tests runloop because it doesn't return a
-        //   true/false like all the other tests; instead, it returns an object
-        //   containing each input type with its corresponding true/false value
-
-        // Big thanks to @miketaylr for the html5 forms expertise. http://miketaylr.com/
-        Modernizr['inputtypes'] = (function(props) {
-
-            for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) {
-
-                inputElem.setAttribute('type', inputElemType = props[i]);
-                bool = inputElem.type !== 'text';
-
-                // We first check to see if the type we give it sticks..
-                // If the type does, we feed it a textual value, which shouldn't be valid.
-                // If the value doesn't stick, we know there's input sanitization which infers a custom UI
-                if ( bool ) {
-
-                    inputElem.value         = smile;
-                    inputElem.style.cssText = 'position:absolute;visibility:hidden;';
-
-                    if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) {
-
-                      docElement.appendChild(inputElem);
-                      defaultView = document.defaultView;
-
-                      // Safari 2-4 allows the smiley as a value, despite making a slider
-                      bool =  defaultView.getComputedStyle &&
-                              defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' &&
-                              // Mobile android web browser has false positive, so must
-                              // check the height to see if the widget is actually there.
-                              (inputElem.offsetHeight !== 0);
-
-                      docElement.removeChild(inputElem);
-
-                    } else if ( /^(search|tel)$/.test(inputElemType) ){
-                      // Spec doesnt define any special parsing or detectable UI
-                      //   behaviors so we pass these through as true
-
-                      // Interestingly, opera fails the earlier test, so it doesn't
-                      //  even make it here.
-
-                    } else if ( /^(url|email)$/.test(inputElemType) ) {
-                      // Real url and email support comes with prebaked validation.
-                      bool = inputElem.checkValidity && inputElem.checkValidity() === false;
-
-                    } else if ( /^color$/.test(inputElemType) ) {
-                        // chuck into DOM and force reflow for Opera bug in 11.00
-                        // github.com/Modernizr/Modernizr/issues#issue/159
-                        docElement.appendChild(inputElem);
-                        docElement.offsetWidth;
-                        bool = inputElem.value != smile;
-                        docElement.removeChild(inputElem);