Changeset 073081 in indico

Timestamp:

02/11/10 15:47:20 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

df3d1f

Parents:

dab490

Message:

[IMP] using and iframe for the description in GS

fixes #164

Location:

indico

Files:

• MaKaC/fossils/conference.py (modified) (1 diff)
• MaKaC/webinterface/tpls/EventModifMainData.tpl (modified) (4 diffs)
• htdocs/js/indico/Core/Widgets/DateTime.js (modified) (1 diff)
• htdocs/js/indico/Core/Widgets/Inline.js (modified) (3 diffs)
• htdocs/js/indico/Core/Widgets/RichText.js (modified) (10 diffs)

indico/MaKaC/fossils/conference.py

@@ -31 +31 @@
         """Conference title"""
 
+    def getDescription(self):
+        """Conference description"""
+
     def getLocation(self):
         """ Location (CERN/...) """

indico/MaKaC/webinterface/tpls/EventModifMainData.tpl

@@ -12 +12 @@
 for fact in wr.getFactoryList():
     val = fact.getId()
-    
+
     if val == 'simple_event':
         val = 'lecture'
-    
-    typeList[fact.getId()] = val 
+
+    typeList[fact.getId()] = val
 
 visibilityList = {}
 topcat = confObj.getOwnerList()[0]
-level = 0        
+level = 0
 visibilityList[0] = 'Nowhere'
 while topcat:
-    level += 1                        
+    level += 1
     if topcat.getId() != "0":
         from MaKaC.common.TemplateExec import truncateTitle
         visibilityList[level] = truncateTitle(topcat.getName(), 50)
-    topcat = topcat.getOwner()        
-visibilityList[999] = 'Everywhere'     
+    topcat = topcat.getOwner()
+visibilityList[999] = 'Everywhere'
 
 numRows = 11
@@ -56 +56 @@
     </td>
     <td>
-        <div class="blacktext" id="inPlaceEditDescription"><%=description %></span>
+        <div class="blacktext" id="inPlaceEditDescription"><%=description %></div>
     </td>
 </tr>
@@ -159 +159 @@
     <% if Config.getInstance().getShortEventURL() != "": %>
       <td class="dataCaptionTD">
-        <span class="dataCaptionFormat"><%= _("Short display URL")%></span>   
-      </td>     
-      <% if shortURL == "" : %>    
-        <td class="blacktext"><em><%= _("There is not any short url yet. Click \"Modify\" to setup.")%></em></td>      
+        <span class="dataCaptionFormat"><%= _("Short display URL")%></span>
+      </td>
+      <% if shortURL == "" : %>
+        <td class="blacktext"><em><%= _("There is not any short url yet. Click \"Modify\" to setup.")%></em></td>
       <% end %>
       <% else : %>
@@ -249 +249 @@
 $E('inPlaceEditStartEndDate').set(new StartEndDateWidget('event.main.changeDates', <%= jsonEncode({'conference': "%s"%conferenceId}) %>, {'startDate': confFossile.startDate, 'endDate': confFossile.endDate}).draw());
 
-<%= macros.genericField(macros.FIELD_RICHTEXT, 'inPlaceEditDescription', 'event.main.changeDescription', {'conference': "%s"%conferenceId}, preCache=True, rh=self._rh, options=(600,400)) %>
+$E('inPlaceEditDescription').set(new RichTextInlineEditWidget('event.main.changeDescription', <%= jsonEncode({'conference': "%s"%conferenceId}) %>, confFossile.description).draw());
 
 <% if evtType == 'conference':%>

indico/htdocs/js/indico/Core/Widgets/DateTime.js

@@ -88 +88 @@
                              Html.div("startEndDate", Html.span({},"ends "),
                                       end));
-         },
-
-         _buildFrame: function(modeChooser, switchChooser) {
-             return Html.div({},
-                             modeChooser,
-                             Html.div({style:{marginTop: '5px'}},
-                                      switchChooser));
-
          },
 

indico/htdocs/js/indico/Core/Widgets/Inline.js

@@ -67 +67 @@
          this.ready.set(false);
          this.loadOnStartup = loadOnStartup;
-         this.source = indicoSource(method, attributes, false, !loadOnStartup);
+         this.source = indicoSource(method, attributes, null, !loadOnStartup);
      });
 
@@ -826 +826 @@
      {
 
+        _buildFrame: function(modeChooser, switchChooser) {
+            return Html.div({},
+                            modeChooser,
+                            Html.div({style:{marginTop: '5px'}},
+                                     switchChooser));
+
+        },
+
          _handleError: function(error) {
              this._error(error);
@@ -878 +886 @@
          },
 
+         /* By default, any input is accepted */
+         _verifyInput: function() {
+             return true;
+         },
+
 
          /* Enables/disables saving */

indico/htdocs/js/indico/Core/Widgets/RichText.js

@@ -1 +1 @@
 var executeOnload = false;
-var __globalEditorTable = {}; 
+var __globalEditorTable = {};
 
 type("RichTextEditor", ["IWidget", "Accessor"],
@@ -22 +22 @@
          postDraw: function() {
              this.div.set('');
-             
+
              this.div.dom.innerHTML = this.editor.CreateHtml();
 
              var self = this;
 
-             this.onLoadFunc = function() {                           
+             this.onLoadFunc = function() {
 
                  if (self.text) {
@@ -36 +36 @@
                       function(callback) {
                           callback();
-                      });                
-
-                 self.editor.Events.AttachEvent( 'OnSelectionChange', 
+                      });
+
+                 self.editor.Events.AttachEvent( 'OnSelectionChange',
                                                  function() {
-                                                     if (!self.observing) {                                                      
+                                                     if (!self.observing) {
                                                          self.startObserving();
                                                      }
-                                                 } ) ;                        
+                                                 } ) ;
              };
-             
+
              if (this.editor && this.editor.SetData) {
                  this.onLoadFunc();
@@ -53 +53 @@
 
          },
-         
+
          set: function(text) {
              var self = this;
@@ -127 +127 @@
              var self = this;
 
-             var observeFunc = function(value) {                 
+             var observeFunc = function(value) {
 
                  self.plain.unbind();
@@ -143 +143 @@
              };
 
-             this.selected.observe(observeFunc);            
+             this.selected.observe(observeFunc);
              observeFunc(this.selected.get());
          },
@@ -234 +234 @@
              {
                  toPlain: command(
-                     toPlainFunc, 
+                     toPlainFunc,
                      $T("switch to plain text")),
                  toRich: command(
@@ -250 +250 @@
              toPlainFunc();
          }
-        
+
          this.rich.onLoad(function() {
              self.loaded = true;
@@ -258 +258 @@
 
 
+type("RichTextInlineEditWidget", ["InlineEditWidget"],
+        {
+            _handleEditMode: function(value) {
+
+                this.description = new RichTextWidget(600, 400,{},'','rich','IndicoMinimal');
+                this.description.set(value);
+                return this.description.draw();
+            },
+
+            _handleDisplayMode: function(value) {
+
+                var iframeId = "descFrame";
+                var iframe = Html.iframe({id: iframeId,name: iframeId, style:{width: pixels(600),
+                                                                              height:pixels(100),
+                                                                              border: "1px dotted #ECECEC"}});
+
+                var loadFunc = function() {
+                    var doc;
+
+                    if (Browser.IE) {
+                        doc = document.frames[iframeId].document;
+                    } else {
+                        doc = $E(iframeId).dom.contentDocument;
+                    }
+                    if (value == "") {
+                        value = '<em>No description</em>';
+                    }
+                    doc.body.innerHTML = '<link href="css/Default.css" type="text/css" rel="stylesheet">' + value;
+                };
+
+                if (Browser.IE) {
+                    iframe.dom.onreadystatechange = loadFunc;
+                } else {
+                    // for normal browsers
+                    iframe.observeEvent("load", loadFunc);
+                }
+
+                return iframe;
+            },
+
+            _getNewValue: function() {
+                return this.description.get();
+            }
+        },
+        function(method, attributes, initValue) {
+            this.InlineEditWidget(method, attributes, initValue);
+        });
+
+
+
 function FCKeditor_OnComplete( editorInstance )
 {
@@ -269 +319 @@
     if(value.editor.IsDirty()) {
         each(value.callbacks, function(func) {
-            func();         
+            func();
         })
         value.editor.ResetIsDirty();