From 3fb746f79be167a6bcaa2c4b30c3c8ff588e33ef Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 10 Sep 2012 23:51:53 -0300 Subject: [PATCH] - Change to start using bootstrap grid --- .../com/wisemapping/filter/UserAgent.java | 2 +- .../wisemapping/mail/NotificationService.java | 1 + .../mail/NotifyingExceptionResolver.java | 2 +- .../com/wisemapping/rest/BaseController.java | 9 +- ...bugMappingJacksonHttpMessageConverter.java | 12 +- .../JsonHttpMessageNotReadableException.java | 8 + .../rest/RestMvcConfiguration.java | 27 -- .../src/main/resources/messages_en.properties | 5 +- .../src/main/resources/messages_es.properties | 8 +- .../src/main/resources/messages_fr.properties | 9 +- .../src/main/resources/messages_it.properties | 2 - .../main/resources/messages_pt_BR.properties | 2 - .../main/resources/messages_zh_CN.properties | 2 - .../main/resources/messages_zh_TW.properties | 2 - .../main/webapp/WEB-INF/wisemapping-rest.xml | 8 +- .../src/main/webapp/css/mindmapList.less | 21 +- .../src/main/webapp/css/pageHeaders.css | 18 +- .../src/main/webapp/css/pageTemplate.css | 242 ++++++++---------- wise-webapp/src/main/webapp/js/mindmapList.js | 11 +- wise-webapp/src/main/webapp/jsp/footer.jsp | 57 +++-- wise-webapp/src/main/webapp/jsp/login.jsp | 40 +-- .../src/main/webapp/jsp/mindmapList.jsp | 198 +++++++------- wise-webapp/src/main/webapp/jsp/template.jsp | 5 +- 23 files changed, 316 insertions(+), 375 deletions(-) create mode 100644 wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java delete mode 100644 wise-webapp/src/main/java/com/wisemapping/rest/RestMvcConfiguration.java diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java b/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java index f8e49ab3..4b1662b8 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/UserAgent.java @@ -333,7 +333,7 @@ public class UserAgent implements Serializable { public boolean isBrowserSupported() { // Is it a supported browser ?. final UserAgent.Product product = this.getProduct(); - boolean result = product == UserAgent.Product.FIREFOX && this.isVersionGreatedOrEqualThan(12, 0); + boolean result = product == UserAgent.Product.FIREFOX && this.isVersionGreatedOrEqualThan(10, 0); result = result || product == UserAgent.Product.EXPLORER && this.isVersionGreatedOrEqualThan(7, 0) && this.getOs() == UserAgent.OS.WINDOWS; result = result || product == UserAgent.Product.OPERA && this.isVersionGreatedOrEqualThan(11, 0); result = result || product == UserAgent.Product.CHROME && this.isVersionGreatedOrEqualThan(18, 0); diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java index f91838e3..e682c055 100644 --- a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java +++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java @@ -20,6 +20,7 @@ package com.wisemapping.mail; import com.wisemapping.filter.UserAgent; import com.wisemapping.model.Collaboration; +import com.wisemapping.model.CollaborationRole; import com.wisemapping.model.Mindmap; import com.wisemapping.model.User; import org.apache.commons.io.IOUtils; diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/NotifyingExceptionResolver.java b/wise-webapp/src/main/java/com/wisemapping/mail/NotifyingExceptionResolver.java index 0841f427..ab798291 100644 --- a/wise-webapp/src/main/java/com/wisemapping/mail/NotifyingExceptionResolver.java +++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotifyingExceptionResolver.java @@ -29,7 +29,7 @@ public class NotifyingExceptionResolver extends SimpleMappingExceptionResolver { } private void sendNotification(@NotNull Exception ex, @NotNull HttpServletRequest request) { - final User user = Utils.getUser(); + final User user = Utils.getUser(false); notificationService.reportJavaException(ex, user, request); } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java b/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java index d36b7edd..404455e3 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java @@ -18,9 +18,7 @@ package com.wisemapping.rest; -import com.wisemapping.exceptions.AccessDeniedSecurityException; import com.wisemapping.exceptions.ClientException; -import com.wisemapping.filter.UserAgent; import com.wisemapping.mail.NotificationService; import com.wisemapping.model.User; import com.wisemapping.rest.model.RestErrors; @@ -69,10 +67,11 @@ public class BaseController { return ex.getMessage(); } - @ExceptionHandler(ValidationException.class) + + @ExceptionHandler(JsonHttpMessageNotReadableException.class) @ResponseStatus(HttpStatus.BAD_REQUEST) - public RestErrors handleValidationErrors(@NotNull ValidationException ex) { - return new RestErrors(ex.getErrors(), messageSource); + public String handleValidationErrors(@NotNull JsonHttpMessageNotReadableException ex) { + return "Request could not be saved. Message is not valid"; } @ExceptionHandler(java.lang.reflect.UndeclaredThrowableException.class) diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java b/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java index 4452480f..9b2d22b6 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java @@ -12,7 +12,7 @@ import java.io.InputStream; public class DebugMappingJacksonHttpMessageConverter extends MappingJacksonHttpMessageConverter { @Override - protected Object readInternal(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { + protected Object readInternal(Class clazz, HttpInputMessage inputMessage) throws IOException, JsonHttpMessageNotReadableException { final byte[] bytes = IOUtils.toByteArray(inputMessage.getBody()); final ByteArrayInputStream bais = new ByteArrayInputStream(bytes); final WrapHttpInputMessage wrap = new WrapHttpInputMessage(bais, inputMessage.getHeaders()); @@ -21,20 +21,14 @@ public class DebugMappingJacksonHttpMessageConverter extends MappingJacksonHttpM return super.readInternal(clazz, wrap); } catch (org.springframework.http.converter.HttpMessageNotReadableException e) { - throw new HttpMessageNotReadableException("Request Body:\n" + new String(bytes, "UTF-8"), e); + throw new JsonHttpMessageNotReadableException("Request Body:\n" + new String(bytes, "UTF-8"), e); } catch (IOException e) { - throw new HttpMessageNotReadableException("Request Body:\n" + new String(bytes, "UTF-8"), e); + throw new JsonHttpMessageNotReadableException("Request Body:\n" + new String(bytes, "UTF-8"), e); } } } -class HttpMessageNotReadableException extends org.springframework.http.converter.HttpMessageNotReadableException { - - public HttpMessageNotReadableException(String msg, Exception cause) { - super(msg, cause); - } -} class WrapHttpInputMessage implements HttpInputMessage { private InputStream body; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java b/wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java new file mode 100644 index 00000000..db078f3c --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java @@ -0,0 +1,8 @@ +package com.wisemapping.rest; + +class JsonHttpMessageNotReadableException extends org.springframework.http.converter.HttpMessageNotReadableException { + + public JsonHttpMessageNotReadableException(String msg, Exception cause) { + super(msg, cause); + } +} diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/RestMvcConfiguration.java b/wise-webapp/src/main/java/com/wisemapping/rest/RestMvcConfiguration.java deleted file mode 100644 index 5bc9d90d..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/rest/RestMvcConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.wisemapping.rest; - -import org.jetbrains.annotations.NotNull; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; - -import java.util.List; - -@EnableWebMvc -@Configuration -public class RestMvcConfiguration extends WebMvcConfigurerAdapter { - - @Override - public void configureMessageConverters(@NotNull final List> converters) { - converters.add(converter()); - super.configureMessageConverters(converters); - } - - @Bean - MappingJacksonHttpMessageConverter converter() { - return new DebugMappingJacksonHttpMessageConverter(); - } -} \ No newline at end of file diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index 5436e614..e9653391 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -145,8 +145,6 @@ MAP_NAME_HINT=Name of the new map to create MAP_DESCRIPTION_HINT=Some description for your map WARNING=Warning DELETE_MAPS_WARNING=Deleted mindmap can not be recovered. Do you want to continue ?. -WHAT_IS_NEW=What is New -WHAT_IS_NEW_DETAILS= THANKS_FOR_SIGN_UP=Thanks for signing up\! SIGN_UP_CONFIRMATION_EMAIL=\ You will receive a confirmation message shortly from WiseMapping. This message will ask you to activate your WiseMapping account.
Please select the link to activate and start creating and sharing maps. SIGN_UP_SUCCESS=Your account has been created successfully, click here to sign in and start enjoying WiseMapping. @@ -244,6 +242,9 @@ CONTACT_US=Contact Us #Pending for translation ... CAPTCHA_LOADING_ERROR=ReCaptcha could not be loaded. You must have access to Google ReCaptcha service. ACCESS_HAS_BEEN_REVOKED= Upps. your access permissions to this map has been revoked. Contact map owner. +LICENSE=License +WELCOME_TO_WISEMAPPING=Welcome to WiseMapping +WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: . diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties index 1bfcf4ad..68a0aa9e 100644 --- a/wise-webapp/src/main/resources/messages_es.properties +++ b/wise-webapp/src/main/resources/messages_es.properties @@ -29,7 +29,7 @@ FORGOT_PASSWORD=Se olvidó la contraseña ? CHANGE_PASSWORD=Cambiar la Contraseña FAQ=Preguntas Frecuentes SHORT_FAQ=FAQ -LOGIN=Entrar +LOGIN=Ingresar MIND_FILE=Archivo EXPORT=Exportar SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG) @@ -142,8 +142,6 @@ MAP_NAME_HINT=El nombre del nuevo mapa MAP_DESCRIPTION_HINT=Una descripción de tu mapa WARNING=Cuidado DELETE_MAPS_WARNING=Una vez borrado de un mapa no puede ser recuperado. Desea continuar ? -WHAT_IS_NEW=Novedades -WHAT_IS_NEW_DETAILS= THANKS_FOR_SIGN_UP=Graciar por registarse ! SIGN_UP_CONFIRMATION_EMAIL=You will receive a confirmation message shortly from WiseMapping. This message will ask you to activate your WiseMapping account.
Please select the link to activate and start creating and sharing maps. SIGN_UP_SUCCESS=Su cuenta ha sido creada exitosamente,haga click acá para ingresar y empezar a disfrutar de WiseMapping. @@ -242,6 +240,10 @@ CONTACT_US=Contáctenos ACCESS_HAS_BEEN_REVOKED=Los permisos de acceso al mapa han sido revocados. No es posible grabar sus cambios. +CAPTCHA_LOADING_ERROR=ReCaptcha no pudo ser cargado. Debes tener accesso al servicio de Google ReCaptcha. +LICENSE=Licencia +WELCOME_TO_WISEMAPPING=Bienvenido a WiseMapping +WELCOME_DETAILS=WiseMapping te permite crear y leer tus mapas mentales en cualquier lugar. Con WiseMapping tu puedes: . diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties index 9b873bb8..68895c8a 100644 --- a/wise-webapp/src/main/resources/messages_fr.properties +++ b/wise-webapp/src/main/resources/messages_fr.properties @@ -125,7 +125,7 @@ IMPORT=Importer EMBEDDED_MAP_SIZE=* Note: vous pouvez changer le format de la carte encapsulée en modifiant les propriétés de style 'height' et 'width'. Vous pouvez aussi modifier le facteur de zoom par le paramètre 'zoom' de l'URL. EXPORT_FORMAT_RESTRICTIONS=Exporter vers Image, PDF ou SVG n'est possible que depuis la barre d'outils de l'éditeur. -STARRED=Etoilé (*) +STARRED=Favoris ALL_MAPS=Toutes les cartes MY_MAPS=Mes cartes SHARED_WITH_ME=Partagées avec moi @@ -151,8 +151,6 @@ MAP_NAME_HINT=Nom de la nouvelle carte à créer MAP_DESCRIPTION_HINT=Brève description de votre carte WARNING=Avertissement DELETE_MAPS_WARNING=Une carte effacée ne peut pas être récupérée. Voulez-vous continuer ? -WHAT_IS_NEW=Quoi de neuf -WHAT_IS_NEW_DETAILS= THANKS_FOR_SIGN_UP=Merci de vous inscrire \! SIGN_UP_CONFIRMATION_EMAIL=\ Vous recevrez prochainement un bref message de confirmation de WiseMapping. Ce message vous demandera d'activer votre compte WiseMapping.
SVP suivez le lien pour activer commencer à créer et partager vos cartes. SIGN_UP_SUCCESS=Votre compte a été créé, cliquez here pour vous connecter et commencer à apprécier WiseMapping. @@ -248,6 +246,11 @@ TUTORIAL.SAMPLE_NOTE=Ceci est une simple note !. +CAPTCHA_LOADING_ERROR=ReCaptcha could not be loaded. You must have access to Google ReCaptcha service. +ACCESS_HAS_BEEN_REVOKED= Upps. your access permissions to this map has been revoked. Contact map owner. +LICENSE=License +WELCOME_TO_WISEMAPPING=Welcome to WiseMapping +WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: . diff --git a/wise-webapp/src/main/resources/messages_it.properties b/wise-webapp/src/main/resources/messages_it.properties index 8ab8e7f7..9720aec2 100644 --- a/wise-webapp/src/main/resources/messages_it.properties +++ b/wise-webapp/src/main/resources/messages_it.properties @@ -145,8 +145,6 @@ MAP_NAME_HINT=Nome della nuova mappa da creare MAP_DESCRIPTION_HINT=Una descrizione della nuova mappa WARNING=Attenzione DELETE_MAPS_WARNING=Eliminando la mappa, non può essere più recuperata. Si desidera continuare? -WHAT_IS_NEW=Cosa c'è di nuovo -WHAT_IS_NEW_DETAILS= THANKS_FOR_SIGN_UP=Grazie per esserti registrato\! SIGN_UP_CONFIRMATION_EMAIL=\ Riceverete un messaggio di conferma da WiseMapping. Questo messaggio vi chiederà di attivare il nuovo account WiseMapping.
Selezionare il link per attivare l'account ed iniziare a creare e condividere le tue mappe. SIGN_UP_SUCCESS=Il tuo account è stato creato correttamente, clicca qui per entrare ed iniziare ad usare WiseMapping. diff --git a/wise-webapp/src/main/resources/messages_pt_BR.properties b/wise-webapp/src/main/resources/messages_pt_BR.properties index 87632212..b21b4b0c 100644 --- a/wise-webapp/src/main/resources/messages_pt_BR.properties +++ b/wise-webapp/src/main/resources/messages_pt_BR.properties @@ -143,8 +143,6 @@ MAP_NAME_HINT=Nome do novo mapa para criar MAP_DESCRIPTION_HINT=Alguma descrição para o seu mapa WARNING=Alerta DELETE_MAPS_WARNING=Mapa mental deletado não poderá ser recuperado. Quer continuar? -WHAT_IS_NEW=O que há de Novo -WHAT_IS_NEW_DETAILS= THANKS_FOR_SIGN_UP=Obrigado por acessar\! SIGN_UP_CONFIRMATION_EMAIL=\ Você receberá uma mensagem de confirmação do WiseMapping em breve. Esta mensagem vai pedir que você ative sua conta WiseMapping.
SElecione o link para ativar e comece criando e compartilhando mapas. SIGN_UP_SUCCESS=Sua conta foi criada com sucesso, clique aqui para acessar e comece a desfrutar do WiseMapping. diff --git a/wise-webapp/src/main/resources/messages_zh_CN.properties b/wise-webapp/src/main/resources/messages_zh_CN.properties index bdcf6fb6..6fbe7de4 100644 --- a/wise-webapp/src/main/resources/messages_zh_CN.properties +++ b/wise-webapp/src/main/resources/messages_zh_CN.properties @@ -145,8 +145,6 @@ MAP_NAME_HINT=新思路图的名字 MAP_DESCRIPTION_HINT=一些有关你的图的描述 WARNING=警告 DELETE_MAPS_WARNING=删除思维导图后无法恢复，是否继续？ -WHAT_IS_NEW=新特性是什么 -WHAT_IS_NEW_DETAILS= THANKS_FOR_SIGN_UP=感谢注册！ SIGN_UP_CONFIRMATION_EMAIL=\ 你不久将收到从WiseMapping发来的一封确认信息. 这个消息将询问你是否激活你的WiseMapping 账户。
请选择链接激活账户，开始创建思路图并分享它们吧。 SIGN_UP_SUCCESS=你的帐户已成功建立, 点击 这里 登录使用WiseMapping. diff --git a/wise-webapp/src/main/resources/messages_zh_TW.properties b/wise-webapp/src/main/resources/messages_zh_TW.properties index 5651f173..86496bc9 100644 --- a/wise-webapp/src/main/resources/messages_zh_TW.properties +++ b/wise-webapp/src/main/resources/messages_zh_TW.properties @@ -145,8 +145,6 @@ MAP_NAME_HINT=新思路圖的名字 MAP_DESCRIPTION_HINT=一些有關你的圖的描述 WARNING=警告 DELETE_MAPS_WARNING=刪除思維導圖後無法恢復，是否繼續？ -WHAT_IS_NEW=新特性是什麼 -WHAT_IS_NEW_DETAILS= THANKS_FOR_SIGN_UP=感謝註冊！ SIGN_UP_CONFIRMATION_EMAIL=\ 你不久將收到從WiseMapping發來的一封確認資訊. 這個消息將詢問你是否啟動你的WiseMapping 帳戶。
請選擇鏈接啟動帳戶，開始創建思路圖並分享它們吧。 SIGN_UP_SUCCESS=你的帳戶已成功建立, 點擊 這裏 登錄使用WiseMapping. diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml index a9de0c13..f99c09ef 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml @@ -14,7 +14,12 @@ - + + + + + + @@ -98,7 +103,6 @@ - diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less index 198bdce2..158a1919 100644 --- a/wise-webapp/src/main/webapp/css/mindmapList.less +++ b/wise-webapp/src/main/webapp/css/mindmapList.less @@ -137,10 +137,6 @@ input#selectAll { /* ----------------------------- Misc ----------------------------------- */ -.messagesPanel { - width: @body-width; -} - .dataTables_empty { text-align: center; } @@ -149,13 +145,13 @@ input#selectAll { background-color: #f5f5f5; } -#buttonsToolbar { - margin: 30px 0px 10px 0px +.buttonsToolbar { + margin: 40px 0px 10px 0px } #tableActions { float: right; - width: 350px; + padding-bottom: 10px; white-space: nowrap; } @@ -171,16 +167,13 @@ input#selectAll { } #tableFooter { - width: 100%; height: 50px; white-space: nowrap; } + #foldersContainer { - width: 15%; - float: left; - margin-right: 2%; - margin-top: 80px + padding-top: 60px; } span.starredOff { @@ -205,8 +198,4 @@ span.starredOn:hover { abbr[title] { cursor: default; -} - -#footer { - border-top: 0px; } \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css index c5d0825b..f02197c7 100644 --- a/wise-webapp/src/main/webapp/css/pageHeaders.css +++ b/wise-webapp/src/main/webapp/css/pageHeaders.css @@ -83,7 +83,6 @@ div#headerTitle { margin-left: 5px; } - span#headerSubTitle { font-weight: lighter; font-size: 12px; @@ -100,31 +99,20 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover { border-bottom: 0; } - #footer { - width: 100%; - border-top: 1px solid #8e9181; - text-align: center; - font-size: 90%; - padding-top:5px; - min-height:40px; + border-top: 1px black solid; + padding-top: 15px; } -#footer > div{ - display: inline-block; -} - div#paypal { float: left; margin: -29px; } - #headerLogo { cursor: pointer; } - div#headerActions { padding-right: 8px; padding-top: 4px; @@ -135,7 +123,7 @@ div#headerActions { } #headerActions span { - border-bottom: 3px solid #F7C931; + border-bottom: 3px solid #F7C931; } div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css index 8ccf80a4..cbab0c77 100644 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ b/wise-webapp/src/main/webapp/css/pageTemplate.css @@ -1,131 +1,111 @@ -@import "../bootstrap/css/bootstrap.min.css"; -@import "../bootstrap/css/bootstrap-responsive.min.css"; - -@import "pageHeaders.css"; - - -#loginContent .loginNews { - float: left; - width: 300px; -} - -div#login { - float: right; - width: 300px; -} - -div#loginContent { - width: 100%; - min-height: 340px; -} - -div#register { - position: relative; - margin: 10px auto; - width: 800px; - text-align: center; - white-space: nowrap; -} - -div#register a { - color: #003399; - font-weight: bold; -} - - -div.pageBodyContent ol { - margin-left: 12px; -} - -div.pageBodyContent ul { - list-style-position: outside; -} - -div.pageBodyContent ol li { - list-style-type: decimal; -} - - -div.pageBody { - margin: 10px auto; - width: 800px; - min-height: 500px; -} - -div.pageBodyContent { - padding-top: 30px; -} - -div.pageBodyContent h1 { - color: #093A9D; - font-size: 150%; - margin-bottom: 5px; - font-weight: bold; -} - -div.pageBodyContent h2 { - color: gray; - font-size: 150%; - border-bottom: 1px dashed #BBB4D6; - margin: 20px 0; -} - -div.pageBodyContent ul { - padding: 5px; -} - -div.pageBodyContent li { - list-style-type: disc; - margin-left: 12px; -} - -/*-- End Main Page Style -- */ - -/* Share Styles */ -#userEmails { - float: left; - width: 50%; - padding: 5px; -} - -#userEmails textarea { - width: 100%; -} - -#currentUsers { - float: left; - width: 40%; - height: 400px; - padding: 5px; - padding-left: 15px; - margin-left: 15px; - border-left: 1px dotted gray; -} - -#currentUsers table { - width: 100%; -} - -#invitation { - border: 1px dotted gray; -} - -span.errorMsg{ - color: red; -} - -div.fform { - background: #eeeeee; - border: 1px solid #cfcfcf; - padding: 5px 25px; - -moz-border-radius: 8px; - -khtml-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; - -} - -div.fform label { - font-weight: bold; -} - +@import "../bootstrap/css/bootstrap.min.css"; +@import "../bootstrap/css/bootstrap-responsive.min.css"; + +@import "pageHeaders.css"; + + +div#register { + margin: 40px auto; + text-align: center; + white-space: nowrap; +} + +div#register a { + color: #003399; + font-weight: bold; +} + + +div.pageBodyContent ol { + margin-left: 12px; +} + +div.pageBodyContent ul { + list-style-position: outside; +} + +div.pageBodyContent ol li { + list-style-type: decimal; +} + + +div.pageBody { + min-height: 500px; +} + +div.pageBodyContent { + padding-top: 30px; +} + +div.pageBodyContent h1 { + color: #093A9D; + font-size: 150%; + margin-bottom: 5px; + font-weight: bold; +} + +div.pageBodyContent h2 { + color: gray; + font-size: 150%; + border-bottom: 1px dashed #BBB4D6; + margin: 20px 0; +} + +div.pageBodyContent ul { + padding: 5px; +} + +div.pageBodyContent li { + list-style-type: disc; + margin-left: 12px; +} + +/*-- End Main Page Style -- */ + +/* Share Styles */ +#userEmails { + float: left; + width: 50%; + padding: 5px; +} + +#userEmails textarea { + width: 100%; +} + +#currentUsers { + float: left; + width: 40%; + height: 400px; + padding: 5px; + padding-left: 15px; + margin-left: 15px; + border-left: 1px dotted gray; +} + +#currentUsers table { + width: 100%; +} + +#invitation { + border: 1px dotted gray; +} + +span.errorMsg{ + color: red; +} + +div.fform { + background: #eeeeee; + border: 1px solid #cfcfcf; + padding: 5px 25px; + -moz-border-radius: 8px; + -khtml-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; +} + +div.fform label { + font-weight: bold; +} + diff --git a/wise-webapp/src/main/webapp/js/mindmapList.js b/wise-webapp/src/main/webapp/js/mindmapList.js index fd9815a4..8d7e5347 100644 --- a/wise-webapp/src/main/webapp/js/mindmapList.js +++ b/wise-webapp/src/main/webapp/js/mindmapList.js @@ -142,7 +142,8 @@ jQuery.fn.dialogForm = function (options) { console.log(errorThrown); console.log(jqXHR); dialogElem.modal('hide'); - $('#messagesPanel div').text(errorThrown).parent().show(); + $('#messagesPanel div div').text(errorThrown); + $('#messagesPanel').show() } var acceptBtn = $('#' + containerId + ' .btn-accept'); acceptBtn.button('reset'); @@ -168,22 +169,22 @@ function updateStatusToolbar() { $("#mindmapListTable tbody input:checked").parent().parent().addClass('row-selected'); $("#mindmapListTable tbody input:not(:checked)").parent().parent().removeClass('row-selected'); - $('#buttonsToolbar').find('.act-single').hide().end().find('.act-multiple').hide(); + $('.buttonsToolbar').find('.act-single').hide().end().find('.act-multiple').hide(); var tableElem = $('#mindmapListTable'); var selectedRows = tableElem.dataTableExt.getSelectedRows(); if (selectedRows.length > 0) { if (selectedRows.length == 1) { - $('#buttonsToolbar').find('.act-single').show().end().find('.act-multiple').show(); + $('.buttonsToolbar').find('.act-single').show().end().find('.act-multiple').show(); // Can be executed by the owner ? var rowData = tableElem.dataTable().fnGetData(selectedRows[0]); if (rowData.role != 'owner') { - $("#buttonsToolbar").find('#publishBtn').hide().end().find('#shareBtn').hide().end().find('#renameBtn').hide(); + $(".buttonsToolbar").find('#publishBtn').hide().end().find('#shareBtn').hide().end().find('#renameBtn').hide(); } } else { - $("#buttonsToolbar .act-multiple").show(); + $(".buttonsToolbar .act-multiple").show(); } } } diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp index 21f31bdd..c7dabe73 100644 --- a/wise-webapp/src/main/webapp/jsp/footer.jsp +++ b/wise-webapp/src/main/webapp/jsp/footer.jsp @@ -1,9 +1,10 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -