closing feature #7103. Removing tabs on event view.

Changing checkbox label 'Priority' by 'Important' Widening of WYSIWYG editor
Silverpeas · Nov 17, 2015 · 0f7d2f6 · 0f7d2f6
1 parent 6c22fc9
commit 0f7d2f6
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 56 deletions.
diff --git a/...h-config/src/main/config/properties/org/silverpeas/almanach/multilang/almanach.properties b/...h-config/src/main/config/properties/org/silverpeas/almanach/multilang/almanach.properties
@@ -30,11 +30,8 @@ auJour = Aujourd'hui
 genererPdfMoisComplet = G\u00e9n\u00e9rer un PDF (mois complet)
 genererPdfJourEvenement = G\u00e9n\u00e9rer un PDF (jours avec \u00e9v\u00e9nement)
 creerEvenement = Cr\u00e9er un \u00e9v\u00e9nement
-accueil = Accueil
+event.new = Nouvel \u00e9v\u00e9n\u00e9ment
 impression = Impression
-evenement = Ev\u00e9nement
-entete = Ent\u00eate
-
 hourBegin = Heure de d\u00e9but
 hourEnd = Heure de fin
 MustContainsCorrectHour = doit contenir un horaire
@@ -118,4 +115,5 @@ almanach.header.periodicity.week.on = Le
 almanach.header.periodicity.frequency.days = jours
 almanach.header.periodicity.frequency.weeks = semaines
 almanach.header.periodicity.frequency.months = mois
-almanach.header.periodicity.frequency.years = ans
+almanach.header.periodicity.frequency.years = ans
+event.important=Important
diff --git a/...onfig/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_de.properties b/...onfig/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_de.properties
@@ -32,11 +32,8 @@ genererPdfMoisComplet = Ein PDF erzeugen (ganzer Monat)
 genererPdfJourEvenement = Ein PDF erzeugen (Tage mit Ereignis)
 almanach.exportToICal = Im iCal Format exportieren
 creerEvenement = Ein Ereignis erstellen
-accueil = Empfang
+event.new = Neues Ereignis
 impression = Druck
-evenement = Ereignis
-entete = Kopf
-
 hourBegin = Anfangszeit
 hourEnd = Endzeit
 MustContainsCorrectHour = Muss eine Zeitspanne enthalten
@@ -127,4 +124,5 @@ almanach.header.periodicity.week.on = am
 almanach.header.periodicity.frequency.days = Tag
 almanach.header.periodicity.frequency.weeks = Woche
 almanach.header.periodicity.frequency.months = Monat
-almanach.header.periodicity.frequency.years = Jahr
+almanach.header.periodicity.frequency.years = Jahr
+event.important=Wichtig
diff --git a/...onfig/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_en.properties b/...onfig/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_en.properties
@@ -32,11 +32,8 @@ genererPdfJourEvenement = Create a Pdf file (only days with an event)
 almanach.genererPdfAnnee = Create a Pdf file (current year)
 almanach.exportToICal = Export iCal
 creerEvenement = New event
-accueil = Welcome
+event.new = New event
 impression = Print
-evenement = Event
-entete = Heading
-
 hourBegin = Start hour
 hourEnd = End hour
 MustContainsCorrectHour = must contain a correct hour
@@ -126,4 +123,5 @@ almanach.header.periodicity.week.on = On
 almanach.header.periodicity.frequency.days = days
 almanach.header.periodicity.frequency.weeks = weeks
 almanach.header.periodicity.frequency.months = months
-almanach.header.periodicity.frequency.years = years
+almanach.header.periodicity.frequency.years = years
+event.important=Important
diff --git a/...onfig/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_fr.properties b/...onfig/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_fr.properties
@@ -32,11 +32,8 @@ genererPdfJourEvenement = G\u00e9n\u00e9rer un PDF (jours avec \u00e9v\u00e9neme
 almanach.genererPdfAnnee = G\u00e9n\u00e9rer un PDF (ann\u00e9e courante)
 almanach.exportToICal = Exporter au format iCal
 creerEvenement = Cr\u00e9er un \u00e9v\u00e9nement
-accueil = Accueil
+event.new = Nouvel \u00e9v\u00e9n\u00e9ment
 impression = Impression
-evenement = Ev\u00e9nement
-entete = Ent\u00eate
-
 hourBegin = Heure de d\u00e9but
 hourEnd = Heure de fin
 MustContainsCorrectHour = doit contenir un horaire
@@ -128,4 +125,5 @@ almanach.header.periodicity.week.on = Le
 almanach.header.periodicity.frequency.days = jours
 almanach.header.periodicity.frequency.weeks = semaines
 almanach.header.periodicity.frequency.months = mois
-almanach.header.periodicity.frequency.years = ans
+almanach.header.periodicity.frequency.years = ans
+event.important=Important
diff --git a/...ach-war/src/main/java/com/stratelia/webactiv/almanach/servlets/AlmanachRequestRouter.java b/...ach-war/src/main/java/com/stratelia/webactiv/almanach/servlets/AlmanachRequestRouter.java
@@ -312,7 +312,7 @@ public String getDestination(String function, AlmanachSessionController almanach
       } else if (function.startsWith("editEvent")) {
         String id = request.getParameter("Id"); // peut etre null en cas de
         // création
-        String eventDate = request.getParameter("Date"); // peut etre null
+        String eventDate = request.getParameter("EventStartDate"); // peut etre null
         // récupère l'Event et sa périodicité
         EventDetail event = almanach.getEventDetail(id);
 

diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/createEvent.jsp b/almanach/almanach-war/src/main/webapp/almanach/jsp/createEvent.jsp
@@ -23,9 +23,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 --%>
-<%@page import="com.stratelia.silverpeas.peasCore.URLManager"%>
-<%@page import="com.silverpeas.util.StringUtil"%>
-<%@page import="com.stratelia.webactiv.util.ResourceLocator"%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
@@ -229,18 +226,14 @@ $(document).ready(function() {
 	$('#eventFrequencyArea').hide();
 	$('.eventPeriodicityDateArea').hide();
 	
-	<view:wysiwyg replace="Description" language="${language}" width="600" height="300" toolbar="almanach" displayFileBrowser="${false}"/>
+	<view:wysiwyg replace="Description" language="${language}" width="98%" height="300" toolbar="almanach" displayFileBrowser="${false}"/>
 });
 </script>
 </head>
 <body onload="document.eventForm.Title.focus()" class="eventManager">
-<fmt:message key="evenement" var="eventTab"/>
-<fmt:message key="accueil" var="currentPathLabel"/>
+<fmt:message key="event.new" var="currentPathLabel"/>
 <view:browseBar componentId="${instanceId}" extraInformations="${currentPathLabel}"/>
 <view:window>
-  <view:tabs>
-    <view:tab action="#" label="${eventTab}" selected="true"/>
-  </view:tabs>
   <view:frame>
       <form name="eventForm" action="editEvent.jsp" method="post">
 
@@ -296,7 +289,7 @@ $(document).ready(function() {
 				</div>
 
 				<div class="field" id="eventPriorityArea">
-					<label for="eventPriority" class="txtlibform"><fmt:message key='GML.priority'/></label>
+					<label for="eventPriority" class="txtlibform"><fmt:message key='event.important'/></label>
 					<div class="champs">
 						<input type="checkbox" class="checkbox" name="Priority" id="eventPriority" value="checkbox"/>
 					</div>

diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/editEvent.jsp b/almanach/almanach-war/src/main/webapp/almanach/jsp/editEvent.jsp
@@ -34,8 +34,6 @@
 <%@ include file="checkAlmanach.jsp" %>
 
 <%
-	String language = almanach.getLanguage();
-
 	EventDetail event = (EventDetail) request.getAttribute("Event");
 	Date startDate = (Date) request.getAttribute("EventStartDate");
 	Date endDate = (Date) request.getAttribute("EventEndDate");
@@ -370,7 +368,7 @@ $(document).ready(function(){
 	
 	changeUnity();
 	
-	<view:wysiwyg replace="Description" language="${language}" width="600" height="300" toolbar="almanach" displayFileBrowser="${false}"/>
+	<view:wysiwyg replace="Description" language="${language}" width="98%" height="300" toolbar="almanach" displayFileBrowser="${false}"/>
 });
 //-->
 </script>
@@ -379,8 +377,6 @@ $(document).ready(function(){
   <%
     Window 		window 		= graphicFactory.getWindow();
     Frame 		frame		= graphicFactory.getFrame();
-    Board 		board 		= graphicFactory.getBoard();
-    TabbedPane 	tabbedPane 	= graphicFactory.getTabbedPane();
 
     OperationPane operationPane = window.getOperationPane();
 
@@ -389,13 +385,9 @@ $(document).ready(function(){
 	browseBar.setComponentName(componentLabel, "almanach.jsp");
 	browseBar.setExtraInformation(event.getTitle());
 
-    operationPane.addOperation(m_context + "/util/icons/almanach_to_del.gif", almanach.getString("GML.delete"), "javascript:onClick=eventDeleteConfirm()");
-    out.println(window.printBefore());
-
-	tabbedPane.addTab(almanach.getString("evenement"), "viewEventContent.jsp?Id="+id+"&Date="+startDateString, false);
-	tabbedPane.addTab(almanach.getString("entete"), "editEvent.jsp?Id="+id+"&Date="+startDateString, true);
+  operationPane.addOperation(m_context + "/util/icons/almanach_to_del.gif", almanach.getString("GML.delete"), "javascript:onClick=eventDeleteConfirm()");
+  out.println(window.printBefore());
 
-	out.println(tabbedPane.print());
 	out.println(frame.printBefore());
 %>
 <form name="eventForm" action="ReallyUpdateEvent" method="post">
@@ -452,7 +444,7 @@ $(document).ready(function(){
 			</div>
 
 			<div class="field" id="eventPriorityArea">
-				<label for="eventPriority" class="txtlibform"><fmt:message key='GML.priority'/></label>
+				<label for="eventPriority" class="txtlibform"><fmt:message key='event.important'/></label>
 				<div class="champs">
 					<input type="checkbox" class="checkbox" name="Priority" id="eventPriority" value="checkbox" <%if (event.getPriority() != 0) out.print("checked=\"checked\"");%>/>
 				</div>

diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/viewEventContent.jsp b/almanach/almanach-war/src/main/webapp/almanach/jsp/viewEventContent.jsp
@@ -74,7 +74,7 @@
 	 }
 %>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><%=generalMessage.getString("GML.popupTitle")%></title>
@@ -104,13 +104,18 @@ function eventDeleteConfirm() {
     }
 }
 
+function editEvent() {
+  document.eventForm.action = "editEvent.jsp";
+  document.eventForm.submit();
+}
+
 function sendEvent(mainAction, action) {
 	document.eventForm.action = mainAction;
 	document.eventForm.Action.value = action;
 	document.eventForm.submit();
 }
 
-function closeMessage()
+function closeDialog()
 {
 	$("#modalDialogOnDelete").dialog("close");
 }
@@ -147,19 +152,11 @@ $(document).ready(function(){
     if (!"user".equals(user))
     {
       operationPane.addLine();
+      operationPane.addOperation(null, almanach.getString("GML.modify"), "javascript:onclick=editEvent()");
       operationPane.addOperation(m_context + "/util/icons/almanach_to_del.gif", almanach.getString("GML.delete"), "javascript:onclick=eventDeleteConfirm()");
     }
 
     out.println(window.printBefore());
-
-    if (!"user".equals(user))
-    {
-    	TabbedPane tabbedPane = graphicFactory.getTabbedPane();
-		tabbedPane.addTab(almanach.getString("evenement"), "viewEventContent.jsp?Id="+id+"&Date="+startDateString, true);
-		tabbedPane.addTab(almanach.getString("entete"), "editEvent.jsp?Id="+id+"&Date="+startDateString, false);
-		out.println(tabbedPane.print());
-    }
-
     out.println(frame.printBefore());
 %>
 
@@ -398,7 +395,7 @@ $(document).ready(function(){
 	%>
 	<form name="eventForm" action="RemoveEvent" method="post">
 		<input type="hidden" name="Action"/>
-   		<input type="hidden" name="Id" value="<%=id%>"/>
+   	<input type="hidden" name="Id" value="<%=id%>"/>
    		<% if (periodicity != null) { %>
    			<input type="hidden" name="EventStartDate" value="<%=startDateString%>"/>
    			<input type="hidden" name="EventEndDate" value="<%=DateUtil.date2SQLDate(endDate)%>"/>
@@ -409,7 +406,7 @@ $(document).ready(function(){
 	ButtonPane buttonPaneOnDelete = graphicFactory.getButtonPane();
 	buttonPaneOnDelete.addButton(graphicFactory.getFormButton(resources.getString("occurenceOnly"), "javascript:onClick=sendEvent('RemoveEvent', 'ReallyDeleteOccurence')", false));
 	buttonPaneOnDelete.addButton(graphicFactory.getFormButton(resources.getString("allEvents"), "javascript:onClick=sendEvent('RemoveEvent', 'ReallyDelete')", false));
-	buttonPaneOnDelete.addButton(graphicFactory.getFormButton(resources.getString("GML.cancel"), "javascript:onClick=closeMessage()", false));
+	buttonPaneOnDelete.addButton(graphicFactory.getFormButton(resources.getString("GML.cancel"), "javascript:onClick=closeDialog()", false));
 	%>
 	<table><tr><td align="center"><br/><%=resources.getString("eventsToDelete") %>
 	<br/><br/>