Author: fdesbois Date: 2010-01-17 15:36:58 +0000 (Sun, 17 Jan 2010) New Revision: 212 Added: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css trunk/suiviobsmer-ui/src/main/webapp/js/dialog.js Log: Try show a popup for comment... Not done yet... Added: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java (rev 0) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java 2010-01-17 15:36:58 UTC (rev 212) @@ -0,0 +1,89 @@ + +package fr.ifremer.suiviobsmer.ui.mixins; + +/** + * PopupPageLink + * + * Created: 17 janv. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +import org.apache.tapestry5.BindingConstants; + +import org.apache.tapestry5.ClientElement; + +import org.apache.tapestry5.ComponentResources; + +import org.apache.tapestry5.Link; + +import org.apache.tapestry5.RenderSupport; + +import org.apache.tapestry5.annotations.Environmental; + +import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; + +import org.apache.tapestry5.annotations.InjectContainer; + +import org.apache.tapestry5.annotations.Parameter; + +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.PageRenderLinkSource; + + at IncludeJavaScriptLibrary("context:js/dialog.js") + +public class PopupPageLink { + + @Inject + + private ComponentResources resources; + + @Environmental + + private RenderSupport renderSupport; + + @InjectContainer + + private ClientElement container; + + @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL) + + private String page; + + + + @Parameter(defaultPrefix = BindingConstants.LITERAL, value="800") + + private String width; + + + + @Parameter(defaultPrefix = BindingConstants.LITERAL, value="600") + + private String height; + + @Parameter + + private Object[] context; + + @Inject + private PageRenderLinkSource pageRender; + + void afterRender() { + Link link = null; + if (context != null) { + link = pageRender.createPageRenderLinkWithContext(page, context); + } else { + link = pageRender.createPageRenderLink(page); + } +// Link link = null; +// pageRender.createPageLink(page, true, context); + + renderSupport.addScript("new PopupPageLink('%s', '%s', %s, %s);", container.getClientId(), link, width, height); + + } + +} \ No newline at end of file Property changes on: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-17 13:58:46 UTC (rev 211) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-17 15:36:58 UTC (rev 212) @@ -449,6 +449,15 @@ contactEdited = true; } +// @Log +// void onSelectedFromSaveComment(String contactId) throws SuiviObsmerException { +// contact = getContacts().get(contactId); +// if (log.isInfoEnabled()) { +// log.info("Comment : " + contact.getComment()); +// } +// contactEdited = true; +// } + /**************************** CONTACT SAVE ********************************/ @Persist("flash") Modified: trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-17 13:58:46 UTC (rev 211) +++ trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-17 15:36:58 UTC (rev 212) @@ -199,7 +199,27 @@ </p:dataInputDateCell> <p:commentCell> <t:if t:test="editionMode"> - <input t:type="textarea" t:id="comment" cols="1" rows="2" value="contact.comment" /> + <!--<img src="${asset:context:}/img/comment-22px.png" alt="Add comment" t:type="any" + t:mixins="popupPageLink" t:title="Commentaire sur le contact" t:page="comment" t:context="contact.topiaId"/>--> +<!-- <img src="${asset:context:}/img/comment-22px.png" alt="Add comment" t:type="any" + t:mixins="window" t:title="Commentaire sur le contact" t:block="comment" /> + <t:block t:id="comment"> + <t:form t:id="commentForm"> + <input t:type="textarea" t:id="comment" cols="5" rows="3" value="contact.comment" /> + </t:form> + </t:block>--> + <input t:type="textarea" t:id="comment" cols="10" rows="1" value="contact.comment" /> +<!-- <a href="#" onclick="window1.showCenter(true)"><img src="${asset:context:}/img/comment-22px.png" alt="Add comment" /></a> + + <div t:type="ck/Window" t:id="window1" style="bluelighting" show="false" modal="true" title="literal:Window 1"> + <h3>Test Window</h3> + <p> + <input t:type="textarea" t:id="comment" cols="20" rows="6" value="contact.comment" /> + <input t:type="submit" t:id="saveComment" class="ico22px save22px" value="Save" + t:context="contact.topiaId" title="Enregistrer le commentaire" /> + </p> + </div>--> + <p:else> ${contact.comment} </p:else> @@ -248,8 +268,12 @@ </form> </t:zone> <script type="text/javascript"> - Event.observe('facadeName', 'change', function() { $('filtersForm').submit(); } ); - Event.observe('company', 'change', function() { $('filtersForm').submit(); } ); -</script><!--Event.observe('company', 'change', function() { $('filtersForm').submit(); } );--> + Event.observe('facadeName', 'change', function() { $('filtersForm').submit(); } ); +</script> +<t:if t:test="user.admin"> + <script type="text/javascript"> + Event.observe('company', 'change', function() { $('filtersForm').submit(); } ); + </script> + </t:if> </t:layout> Modified: trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css 2010-01-17 13:58:46 UTC (rev 211) +++ trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css 2010-01-17 15:36:58 UTC (rev 212) @@ -103,7 +103,7 @@ div#so-contacts table.t-data-grid thead tr th.dataInputDate, div#so-contacts table.t-data-grid thead tr th.tideEndDate, div#so-contacts table.t-data-grid thead tr th.tideBeginDate { - /*width: 120px;*/ + width: 90px; white-space: normal; text-align: center; } @@ -119,10 +119,12 @@ width: 100px; } + div#so-contacts table.t-data-grid thead tr th.actions { width: 90px; } + div#so-contacts table.t-data-grid tbody tr td { white-space: nowrap; } Modified: trunk/suiviobsmer-ui/src/main/webapp/js/dialog.js =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/js/dialog.js 2010-01-17 13:58:46 UTC (rev 211) +++ trunk/suiviobsmer-ui/src/main/webapp/js/dialog.js 2010-01-17 15:36:58 UTC (rev 212) @@ -18,3 +18,51 @@ } } }); + +//var BlockPopup = Class.create({ +// initialize: function(linkElement, title, width, height, blockElement) { +// this.window = new Window({ +// className: 'alphacube', +// title: title, +// hideEffect:Element.hide, +// showEffect:Element.show, +// width: width, +// height: height +// }); +// +// this.block = $(blockElement).innerHTML; +// $(linkElement).observe('click',this.openWindow.bindAsEventListener(this)); +// }, +// openWindow: function(e) { +// this.window.getContent().update(this.block); +// this.window.showCenter(true); +// } +//}); +// +//var PopupPageLink = Class.create({ +// +// initialize: function(id, link, width, height) { +// +// this.element = $(id); +// +// this.link = link; +// +// this.width = width; +// +// this.height = height; +// +// Event.observe(this.element, 'click', this.onclick.bindAsEventListener(this)); +// +// }, +// +// onclick: function() { +// +// var name = 'dialogWindow'; +// +// var win = window.open(this.link,name,'width=' + this.width + ',height=' + this.height + ',resizable=yes,scrollbars=yes,menubar=no,screenX=0,screenY=0,left=0,top=0' ); +// +// win.focus(); +// +// } +// +//});