Author: sletellier Date: 2011-06-27 11:56:47 +0200 (Mon, 27 Jun 2011) New Revision: 92 Url: http://chorem.org/repositories/revision/vradi/92 Log: Add option page to manage vradi web Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java trunk/vradi-web/src/main/webapp/WEB-INF/jsp/options.jsp trunk/vradi-web/src/main/webapp/css/style.css Removed: trunk/vradi-web/src/main/webapp/css/search.css Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LogoutAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties trunk/vradi-web/src/main/resources/log4j.properties trunk/vradi-web/src/main/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-06-27 09:56:47 UTC (rev 92) @@ -6,6 +6,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.entities.VradiUser; +import org.chorem.vradi.services.FileService; import org.chorem.vradi.services.VradiDataService; import org.chorem.vradi.services.VradiServiceFactory; import org.nuiton.util.ApplicationConfig; @@ -31,6 +32,7 @@ transient protected VradiProxy proxy = null; transient protected VradiDataService dataService; + transient protected FileService fileService; public VradiSession() { // FIXME poussin 20110521 ? @@ -106,6 +108,18 @@ return dataService; } + public FileService getFileService() { + if (fileService == null) { + synchronized(VradiSession.class) { + if (fileService == null) { + ApplicationConfig config = VradiWebConfig.getConfig(); + fileService = VradiServiceFactory.getFileService(config); + } + } + } + return fileService; + } + public VradiUser getUser() { return user; } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java 2011-06-27 09:56:47 UTC (rev 92) @@ -9,6 +9,7 @@ import org.nuiton.wikitty.WikittyConfigOption; import sun.security.jca.GetInstance; +import java.util.List; import java.util.Locale; import static org.nuiton.i18n.I18n._; @@ -83,6 +84,10 @@ return config; } + public static List<String> getAdminEmail() { + return VradiServiceConfigurationHelper.getMailAdmin(getConfig()); + } + public static String getVradiVersion() { return getConfig().getOption(VradiWebOption.VRADI_VERSION.getKey()); } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-06-27 09:56:47 UTC (rev 92) @@ -2,9 +2,6 @@ import org.chorem.vradi.entities.VradiUser; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.search.Search; import static org.nuiton.i18n.I18n.n_; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LogoutAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LogoutAction.java 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LogoutAction.java 2011-06-27 09:56:47 UTC (rev 92) @@ -1,11 +1,16 @@ package org.chorem.vradi.actions; /** - * Created by IntelliJ IDEA. - * User: letellier - * Date: 19/05/11 - * Time: 12:05 - * To change this template use File | Settings | File Templates. + * Invalide la session courante et donc de-authentifie l'utilisateur + * + * @author poussin */ -public class LogoutAction { +public class LogoutAction extends VradiBaseAction { + + private static final long serialVersionUID = 4806944250461551896L; + + public String execute() { + getVradiSession().invalidate(session); + return SUCCESS; + } } Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/OptionsAction.java 2011-06-27 09:56:47 UTC (rev 92) @@ -0,0 +1,167 @@ +package org.chorem.vradi.actions; + +import org.apache.commons.lang.StringUtils; +import org.chorem.vradi.VradiWebConfig; +import org.chorem.vradi.entities.VradiUser; +import org.chorem.vradi.services.managers.MailingManager; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.nuiton.i18n.I18n._; + +/** + * Action used for vradi web options page + * + * @author sletellier + */ +public class OptionsAction extends VradiBaseAction { + + protected String thesaurusPath; + protected String thesaurusName; + protected String thesaurusNewChildName; + protected String thesaurusRenamed; + + protected File webHarvestScript; + protected String rssUrl; + protected String comment; + + public String getThesaurusPath() { + return thesaurusPath; + } + + public void setThesaurusPath(String thesaurusPath) { + this.thesaurusPath = thesaurusPath; + } + + public String getThesaurusName() { + return thesaurusName; + } + + public void setThesaurusName(String thesaurusName) { + this.thesaurusName = thesaurusName; + } + + public String getThesaurusNewChildName() { + return thesaurusNewChildName; + } + + public void setThesaurusNewChildName(String thesaurusNewChildName) { + this.thesaurusNewChildName = thesaurusNewChildName; + } + + public String getThesaurusRenamed() { + return thesaurusRenamed; + } + + public void setThesaurusRenamed(String thesaurusRenamed) { + this.thesaurusRenamed = thesaurusRenamed; + } + + public File getWebHarvestScript() { + return webHarvestScript; + } + + public void setWebHarvestScript(File webHarvestScript) { + this.webHarvestScript = webHarvestScript; + } + + public String getRssUrl() { + return rssUrl; + } + + public void setRssUrl(String rssUrl) { + this.rssUrl = rssUrl; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + @Override + public String execute() throws Exception { + + boolean sent = true; + if (!StringUtils.isEmpty(thesaurusNewChildName)) { + // User propose new thesaurus child + sent &= EmailType.THESAURUS_NEW_CHILD.sendEmail(getUser(), comment, thesaurusPath, thesaurusNewChildName); + } + if (!StringUtils.isEmpty(thesaurusRenamed)) { + // User propose to rename thesaurus + sent &= EmailType.THESAURUS_RENAMED.sendEmail(getUser(), comment, thesaurusPath, thesaurusName, thesaurusRenamed); + } + if (webHarvestScript != null) { + // Upload file + String uri = getVradiSession().getFileService().uploadWebHarvestScript(webHarvestScript); + + // User propose to add a webharvest script + sent &= EmailType.WEBHARVEST.sendEmail(getUser(), comment, uri); + } + if (!StringUtils.isEmpty(rssUrl)) { + // User propose to add an rss + sent &= EmailType.RSS.sendEmail(getUser(), comment, rssUrl); + } + + if (sent) { + return SUCCESS; + } else { + return ERROR; + } + } + + public enum EmailType { + THESAURUS_NEW_CHILD("vradi.template.thesaurus.new.child"), + THESAURUS_RENAMED("vradi.template.thesaurus.renamed"), + WEBHARVEST("vradi.template.webHarvest"), + RSS("vradi.template.rss"); + + public static final String TITLE_PREFIX = ".title"; + private String key; + + EmailType(String key) { + this.key = key; + } + + /** + * We consider that i18n is created for key with login and more in args + * + * @param user ask to send msg + * @param args to add in message + * @return true if send + */ + public boolean sendEmail(VradiUser user, String comment, String... args) { + String title = _(key + TITLE_PREFIX); + + List<String> argsList = new ArrayList<String>(); + argsList.add(user.getLogin()); + argsList.add(comment); + argsList.addAll(Arrays.asList(args)); + + String msg = _(key, argsList.toArray(new String[argsList.size()])); + + List<String> adminEmail = VradiWebConfig.getAdminEmail(); + for (String recipient : adminEmail) { + try { + MailingManager.postMail(VradiWebConfig.getConfig(), recipient, title, false, msg); + if (log.isDebugEnabled()) { + log.debug("Mail is sent from '" + user.getLogin() + + "' to '" + recipient + "' with title '" + + title + "' and body : " + msg); + } + } catch (Exception eee) { + log.error("Failed to send email from '" + user.getLogin() + + "' to '" + recipient + "' with title '" + + title + "' and body : " + msg, eee); + return false; + } + } + return true; + } + } +} Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-06-27 09:56:47 UTC (rev 92) @@ -80,13 +80,6 @@ this.request = request; } - /** - * Initializes everything before displaying the home page - */ - public String execute() { - return SUCCESS; - } - public String refreshForm() { if (!StringUtils.isEmpty(selectedQuery)) { @@ -119,6 +112,10 @@ } public String switchQueryActivation() { + + // Save query before activate + saveQuery(); + // Activate or not query for user, if it's the first one, user and client will // be created to add request. It will be automaticly added to email binding. VradiUser user = getUser(); Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-06-27 09:56:47 UTC (rev 92) @@ -15,6 +15,9 @@ vradi.login.password=Password vradi.login.repeatPassword=Confirm vradi.login.submit=Connection +vradi.logout.submit=Logout +vradi.options=Options +vradi.options.title=Options vradi.login.title=Connection vradi.register.mailEmail=Your email vradi.register.mailHi=Hello @@ -40,4 +43,14 @@ vradi.formView.title=Form view vradi.search.thesaurusFilterButton=Filter vradi.form.editAction=Edit -vradi.form.action=Action \ No newline at end of file +vradi.form.action=Action +vradi.action.submit=Submit to administrators +vradi.options.comment=Comment +vradi.template.rss=User %1$s ask to add RSS '%3$s' with comment \: %2$s +vradi.template.rss.title=[Vradi web] Ask to ass RSS +vradi.template.thesaurus.new.child=User %1$s ask to add thesaurus for path '%3$s' with name '%4$s' with comment \: %2$s +vradi.template.thesaurus.new.child.title=[Vradi web] Ask to add thesaurus +vradi.template.thesaurus.renamed=User %1$s ask to rename thesaurus for path '%3$s' was name '%4$s' to name '%5$s' with comment \: %2$s +vradi.template.thesaurus.renamed.title=[Vradi web] Ask to rename thesuaurus +vradi.template.webHarvest=User %1$s ask to add webHarvest script '%3$s' with comment \: %2$s +vradi.template.webHarvest.title=[Vradi web] Ask to add webHarvest script \ No newline at end of file Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-06-27 09:56:47 UTC (rev 92) @@ -1,5 +1,6 @@ vradi.action.locale.english=Anglais vradi.action.locale.french=Français +vradi.action.submit=Soumettre aux administrateurs vradi.authentification.error=Erreur lors de l'authentification vradi.config.configFileName.description=Fichier de configuration de Vradi web vradi.config.database.version.description=Version de la base de donnée @@ -23,6 +24,12 @@ vradi.login.repeatPassword=Confiramtion vradi.login.submit=Connection vradi.login.title=Connection +vradi.logout.submit=Déconnection +vradi.options=Options +vradi.options.comment=Commentaires +vradi.options.rssUrl=Ajout d'un flux RSS +vradi.options.title=Options +vradi.options.webHarvestScript=Ajouter un script <a href\="http\://web-harvest.sourceforge.net/">WebHarvest</a> vradi.register.emailAlreadyUsed=Cette adresse email est déjà utilisée vradi.register.invalidLogin=Une erreur s'est produite pendant l'enregistrement de vos informations, merci d'essayer à nouveau vradi.register.mailEmail=Votre email @@ -40,5 +47,16 @@ vradi.search.thesaurusFilterButton=Filtrer vradi.search.title=Recherche vradi.search.unActivateQuery=Desactiver +vradi.template.rss=L'utilisateur %1$s à fait la demande d'ajout du flux RSS '%3$s' avec le commentaire suivant \: %2$s +vradi.template.rss.title=[Vradi web] Demande d'ajout d'un flux RSS +vradi.template.thesaurus.new.child=L'utilisateur %1$s à fait la demande d'ajout d'un thesaurus pour le chemin '%3$s' qui aura pour nom '%4$s' avec le commentaire suivant \: %2$s +vradi.template.thesaurus.new.child.title=[Vradi web] Demande d'ajout d'un thesaurus +vradi.template.thesaurus.renamed=L'utilisateur %1$s à fait la demande de renomage d'un thesaurus pour le chemin '%3$s' qui avais le nom '%4$s' avec pour nouveau nom '%5$s' avec le commentaire suivant \: %2$s +vradi.template.thesaurus.renamed.title=[Vradi web] Demande de renomage d'un thesaurus +vradi.template.webHarvest=L'utilisateur %1$s à fait la demande d'ajout du script webHarvest disponible à l'adresse '%3$s' avec le commentaire suivant \: %2$s +vradi.template.webHarvest.title=[Vradi web] Demande d'ajout d'un script webHarvest +vradi.thesaurus.path=Chemin du descripteur \: +vradi.thesaurus.thesaurusNewChildName=Nom du nouveau fils pour le descripteur séléctionné +vradi.thesaurus.thesaurusRenamed=Nouveau nom du descripteur séléctionné vradi.title=Vradi Web vradi.user.noinfo= Modified: trunk/vradi-web/src/main/resources/log4j.properties =================================================================== --- trunk/vradi-web/src/main/resources/log4j.properties 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/resources/log4j.properties 2011-06-27 09:56:47 UTC (rev 92) @@ -8,6 +8,7 @@ # package level log4j.logger.org.chorem.vradi=DEBUG +log4j.logger.org.chorem.vradi.actions.OptionsAction=DEBUG #log4j.logger.org.nuiton.util.TimeLog=WARN log4j.logger.org.apache.struts2.dispatcher.mapper=DEBUG log4j.logger.com.opensymphony.sitemesh=DEBUG Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-06-27 09:56:47 UTC (rev 92) @@ -115,6 +115,14 @@ </action> <!-- + | Search + +--> + <action name="options" class="org.chorem.vradi.actions.OptionsAction"> + <result>/WEB-INF/jsp/options.jsp</result> + </action> + + + <!-- | Thesaurus +--> <action name="thesaurus" class="org.chorem.vradi.actions.ThesaurusAction"> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-06-27 09:56:47 UTC (rev 92) @@ -1,11 +1,35 @@ +<%@ page import="org.chorem.vradi.VradiSession" %> +<%@ page import="com.opensymphony.xwork2.ActionContext" %> +<%@ page import="org.chorem.vradi.entities.VradiUser" %> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> -<%@taglib prefix="s" uri="/struts-tags" %> +<%@taglib prefix="s" uri="/struts-tags"%> <div id="header" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <div> - <title><s:text name="vradi.title" /></title> +<% + VradiSession vradiSession = VradiSession.getVradiSession(session); + VradiUser user = vradiSession.getUser(); + ActionContext.getContext().put("logged", user != null); +%> + <div id="titlePanel"> + <h1><s:text name="vradi.title" /></h1> </div> + <s:if test="logged"> + <div id="logoutPanel"> + <s:a id="logout" + action="logout"> + + <s:text name="vradi.logout.submit" /> + </s:a> + </div> + <div id="optionsPanel"> + <s:a id="options" + action="options"> + + <s:text name="vradi.options"/> + </s:a> + </div> + </s:if> <div id="msg"> <span id="actionmessageHeader"> <s:actionmessage /> Added: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/options.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/options.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/options.jsp 2011-06-27 09:56:47 UTC (rev 92) @@ -0,0 +1,122 @@ +<%@page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> +<%@taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@taglib prefix="sjt" uri="/struts-jquery-tree-tags" %> + +<html> +<head> + <s:url var="css" value="/css/style.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <title><s:text name="vradi.options.title" /></title> + <sj:head compressed="false" + jquerytheme="redmond" + debug="true" + jqueryui="true"/> + + <script type="text/javascript"> + <%-- Thesaurus --%> + $.subscribe('treeClicked', function(event, data) { + var item = event.originalEvent.data.rslt.obj; + var thesaurusName = item.children("a").text(); + var thesaurusRenamedInput = $('#thesaurusRenamed')[0]; + thesaurusRenamedInput.value = thesaurusName.trim(); + thesaurusRenamedInput.disabled=false; + $('#thesaurusName')[0].value = thesaurusName.trim(); + $('#thesaurusNewChildName')[0].disabled=false; + + var parent = item.parentsUntil(".jstree", "li"); + var path = ""; + var parentName = parent.text(); + while (parentName.length > 0) { + var itemName = parent.children("a").text().trim(); + path = "/" + itemName + path; + parent = parent.parentsUntil(".jstree", "li"); + parentName = parent.text(); + } + $('#thesaurusPathLbl')[0].innerHTML = path.trim(); + $('#thesaurusPath')[0].value = path.trim(); + }); + + </script> +</head> +<body> +<div> + <div id="thesaurusPanel" class="left"> + <sj:div id="thesaurusDiv" href="/fragment/thesaurusFilter.action" indicator="indicator-thesaurus"> + <img id="indicator-thesaurus" src="/img/indicator.gif" alt="Loading..." style="display:none"/> + </sj:div> + </div> + + <div id="contentPanel" + class="contentPanel"> + <s:form action="options" + theme="simple" + method="post" + enctype="multipart/form-data"> + <table> + <tr> + <th> + <s:text name="vradi.options.rssUrl"/> + </th> + <th> + <s:textfield name="rssUrl"/> + </th> + </tr> + <tr> + <th> + <s:text name="vradi.options.webHarvestScript"/> + </th> + <th> + <s:file name="webHarvestScript"/> + </th> + </tr> + <tr> + <th> + <s:text name="vradi.thesaurus.path"/> + </th> + <th> + <label id="thesaurusPathLbl"></label> + <s:textfield id="thesaurusPath" + name="thesaurusPath" + cssClass="hidden"/> + </th> + </tr> + <tr> + <th> + <s:text name="vradi.thesaurus.thesaurusRenamed"/> + </th> + <th> + <s:textfield id="thesaurusRenamed" + name="thesaurusRenamed" + disabled="true"/> + <s:textfield id="thesaurusName" + name="thesaurusName" + cssClass="hidden"/> + </th> + </tr> + <tr> + <th> + <s:text name="vradi.thesaurus.thesaurusNewChildName"/> + </th> + <th> + <s:textfield id="thesaurusNewChildName" + name="thesaurusNewChildName" + disabled="true"/> + </th> + </tr> + <tr> + <th> + <s:text name="vradi.options.comment"/> + </th> + <th> + <s:textarea id="comment" + name="comment"/> + </th> + </tr> + </table> + <s:submit key="vradi.action.submit"/> + </s:form> + </div> +</div> +</body> +</html> \ No newline at end of file Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-06-27 09:56:47 UTC (rev 92) @@ -6,7 +6,7 @@ <html> <head> - <s:url var="css" value="/css/search.css" /> + <s:url var="css" value="/css/style.css" /> <link href="${css}" rel="stylesheet" type="text/css" /> <title><s:text name="vradi.search.title" /></title> <sj:head compressed="false" @@ -24,6 +24,7 @@ <%-- Thesaurus --%> $.subscribe('treeClicked', function(event, data) { var item = event.originalEvent.data.rslt.obj; + var thesaurusName = item.children("a").text(); var parent = item.parentsUntil(".jstree", "li"); var finalName; var parentName = parent.text(); @@ -36,7 +37,7 @@ parent = parent.parentsUntil(".jstree", "li"); parentName = parent.text(); } - finalName = rootName + ":\"" + item.text().trim() + "\""; + finalName = rootName + ":\"" + thesaurusName.trim() + "\""; } $('#searchArea')[0].value += finalName.trim(); }); @@ -67,11 +68,10 @@ <sj:div id="thesaurusDiv" href="/fragment/thesaurusFilter.action" indicator="indicator-thesaurus"> <img id="indicator-thesaurus" src="/img/indicator.gif" alt="Loading..." style="display:none"/> </sj:div> - </div> <div id="contentPanel" - class="queriesPanel"> + class="contentPanel"> <sj:div id="savedQueriesPanel" href="/fragment/savedQuery.action" listenTopics="updateQueries" Deleted: trunk/vradi-web/src/main/webapp/css/search.css =================================================================== --- trunk/vradi-web/src/main/webapp/css/search.css 2011-06-24 09:54:38 UTC (rev 91) +++ trunk/vradi-web/src/main/webapp/css/search.css 2011-06-27 09:56:47 UTC (rev 92) @@ -1,75 +0,0 @@ -/* Layout */ - -div.left{ - float:left; -} - -#doUpdateFormSubmit { - display: none; -} - -.ui-pg-table { - font-size: 11px; -} - -.right{ - float:right; -} - -.left { - float:left; -} - -.button { - margin-top:20px; - height:31px; - line-height:31px; - font-weight:bold; - border:none; - width:auto; - padding:2px; -} - -#thesaurusPanel { - width: 20%; -} - -#wrap { - height: 100%; -} - -#savedQueriesPanel { - float:left; - height: 10px; -} - -.queriesPanel { - width: 80%; - float:right; -} - -#queryNamePanel { - text-align: right; - width: 62%; -} - -.queryPanel { - width: 77%; - float:left; -} - -#thesaurusForm { - height: 5%; -} - -#searchActionPanel { - float:right; -} - -#searchForm { - height: 150px; -} - -textarea { - width: 100%; -} Copied: trunk/vradi-web/src/main/webapp/css/style.css (from rev 88, trunk/vradi-web/src/main/webapp/css/search.css) =================================================================== --- trunk/vradi-web/src/main/webapp/css/style.css (rev 0) +++ trunk/vradi-web/src/main/webapp/css/style.css 2011-06-27 09:56:47 UTC (rev 92) @@ -0,0 +1,83 @@ +/* Layout */ + +#contentPanel th { + text-align: left; +} + +div.left{ + float:left; +} + +#doUpdateFormSubmit { + display: none; +} + +.hidden { + display: none; +} + +.ui-pg-table { + font-size: 11px; +} + +.right{ + float:right; +} + +.left { + float:left; +} + +.button { + margin-top:20px; + height:31px; + line-height:31px; + font-weight:bold; + border:none; + width:auto; + padding:2px; +} + +#thesaurusPanel { + width: 20%; +} + +#wrap { + height: 100%; +} + +#savedQueriesPanel { + float:left; + height: 10px; +} + +.contentPanel { + width: 80%; + float:right; +} + +#queryNamePanel { + text-align: right; + width: 62%; +} + +.queryPanel { + width: 77%; + float:left; +} + +#thesaurusForm { + height: 5%; +} + +#searchActionPanel { + float:right; +} + +#searchForm { + height: 150px; +} + +textarea { + width: 100%; +}