Changeset 2114

Timestamp:

07/16/10 14:19:10 (19 months ago)

Author:

dart

Message:

LoReality?:
o Messsager is now full ajax. Can reply to a mail now.

Location:

trunk/loreality

Files:

• development.db (modified) (previous)
• loreality/config/routing.py (modified) (1 diff)
• loreality/controllers/messager.py (modified) (4 diffs)
• loreality/public/js (added)
• loreality/public/js/messager.js (added)
• loreality/public/style.css (modified) (1 diff)
• loreality/templates/base/index.html (modified) (2 diffs)
• loreality/templates/derived/page/messager.html (modified) (1 diff)

trunk/loreality/loreality/config/routing.py

@@ -11 +11 @@
     """Create, configure and return the routes Mapper"""
     map = Mapper(directory=config['pylons.paths']['controllers'],
-                 always_scan=config['debug'])
+                 always_scan=config['debug'], explicit=True)
     map.minimization = False
 

trunk/loreality/loreality/controllers/messager.py

@@ -21 +21 @@
 import uuid
 from pylons.i18n.translation import _, ungettext
+from webhelpers.html.tags import literal
 
 class MessagerController(BaseController):
@@ -61 +62 @@
         return render('/derived/page/messager.html')
     #--------------------------------------------------------------
-    def open(self, id):
-        return self.index(opened=uuid.UUID(id))
-    #--------------------------------------------------------------
     @jsonify
     def getallmsgs(self):
@@ -77 +75 @@
         for m in messages:
             p = pilot_q.filter_by(id=m.from_).first()
-            res['messages'].append({ 'date': m.date.strftime("%c"), 'from':p.name, 'subject':m.subject })
+            res['messages'].append({
+                'date': m.date.strftime("%c"),
+                'from':p.name,
+                'subject':m.subject,
+                'unread':m.unread,
+                'id':str(m.id),
+                })
         return res
     #--------------------------------------------------------------
+    @jsonify
     def getmsg(self, id):
         pilot_q = meta.Session.query(model.Pilot)
         pilot = pilot_q.filter_by(login=request.environ['REMOTE_USER']).first()
         if pilot is None:
-            abort(404)
+            return "Error"
 
         message_q = meta.Session.query(model.Message)
@@ -98 +103 @@
             message.unread = False
             meta.Session.commit()
-        return "%s|%s|%s"% ( str(message.id), message.text, pilot.messages_unread )
+
+        p = pilot_q.filter_by(id=message.from_).first()
+        res = {}
+        res['message'] = {
+            'unread':p.messages_unread,
+            'id':str(message.id),
+            'text':literal(message.text),
+            }
+        return res
+    #--------------------------------------------------------------
+    def reply(self, id):
+        pilot_q = meta.Session.query(model.Pilot)
+        pilot = pilot_q.filter_by(login=request.environ['REMOTE_USER']).first()
+        if pilot is None:
+            return "Error"
+
+        message_q = meta.Session.query(model.Message)
+        message = message_q.filter_by(id=uuid.UUID(id)).first()
+        if message is None:
+            return "Error"
+        
+        #- Be sure it is our message
+        if message not in pilot.messages: return "Error"
+
+        values = dict(request.params)
+
+        pilotid = message.from_
+        dest_pilot = pilot_q.filter_by(id=pilotid).first()
+        msg = model.Message()
+        msg.from_ = pilot.id
+        msg.subject = _("Re:") + message.subject
+        msg.text = values["text"]
+        dest_pilot.send_message( msg )
+        meta.Session.commit()
+        return "ok"
     #--------------------------------------------------------------
     def delete(self, id):

trunk/loreality/loreality/public/style.css

@@ -66 +66 @@
 
 /* MESSAGER */
-div.message_box {
- display: right;
- font-size: x-small;
-}
-div.message {
- display: inline;
- /* border: solid black 1px; */
- width: 80%;
- /* background: #AAAAAA; */
- font-size: small;
-}
-
-div.message a{
-    text-decoration:none ;
-}
-div.message span#subject {
-    font-weight: bold;
-    font-size: large;
-    margin-right: 30px;
-}
-span.read{
+.read{
     font-weight: normal;
     background: #AAAAAA;
 }
-span.unread{
+.unread{
     font-weight: bold;
     color: #aa1111;
     background: #ffffff;
 }
-div.message_open{
- width: 80%;
- border: solid black 1px;
- background: #ffffff;
- color: #000000;
- margin-bottom: 20px;
+
+.from .subject{
+    text-align: left;
 }
-div.message_open span{
- color: red;
-    font-size: large;
+.date{
+    text-align: right;
 }
-
+.message_open {
+    border-left: solid 3px darkGrey;
+    padding-left: 5px;
+    background: #909090; 
+}
+table#message_table {
+    width: 100%;
+    margin-left: 5px;
+    margin-right: 5px;
+}

trunk/loreality/loreality/templates/base/index.html

@@ -10 +10 @@
 <html>
 <head>
-${ h.stylesheet_link( '/style.css') }
-  <style type="text/css">
-      @import "dojoroot/dijit/themes/tundra/tundra.css";
-      @import "dojoroot/dojo/resources/dojo.css";
-  </style>
+${ h.stylesheet_link( '/style.css',
+      "/dojo/dijit/themes/tundra/tundra.css",
+      "/dojo/dojo/resources/dojo.css") }
 
 ${ h.javascript_link( '/dojo/dojo/dojo.js',  djConfig="parseOnLoad: true") }
@@ -21 +19 @@
      dojo.require("dijit.form.Button");
      dojo.require("dijit.Editor");
+     dojo.require("dijit._editor.plugins.AlwaysShowToolbar");
      dojo.require("dojo.fx");
      dojo.require("dojo.html");

trunk/loreality/loreality/templates/derived/page/messager.html

@@ -1 +1 @@
 <%inherit file="/base/index.html"/>
-
-<script>
-/*-------------------------------------*/
-function showMessage(data,ioArgs) {
-    if( data == "Error"){
-        alert("Error");
-        }else{
-        d = data.split('|');
-        dojo.fx.wipeIn({
-            node:"message-" + d[0],
-            beforeBegin: function(n){
-                dojo.byId("message-txt-"+d[0]).innerHTML = d[1];
-            }
-        }).play();
-        dojo.byId( "nb_msg_unread").innerHTML = d[2];
-    }
-
-}
-/*-------------------------------------*/
-function helloError(data, ioArgs) {
-    alert('Error when retrieving data from the server!');
-}
-/*-------------------------------------*/
-function loadMsg() {
-    dojo.empty("message_table");
-    dojo.xhrGet({
-        url: '${h.url_for(controller='messager', action='getallmsgs') }',
-        load: fillMessages,
-        error: helloError,
-    }).play();
-}
-dojo.addOnLoad( loadMsg );
-/*-------------------------------------*/
-function fillMessages(data,ioArgs) {
-    if( data == "Error"){
-        alert("Error");
-        }else{
-        objects = dojox.json.ref.fromJson(data);
-        messages = objects['messages'];
-
-        var buffer = "";
-        for (i = 0; i < messages.length; i += 1) {
-            msg = messages[i];
-            buffer += "<tr><td>" + msg['date'] + '</td><td>' + msg['from'] + '</td><td>' + msg['subject'] +"</td></tr>" 
-        }
-        dojo.html.set("message_table", buffer);
-
-    }
-}
-</script>
-
+${ h.javascript_link( '/js/messager.js') }
 <h2>Messager</h2>
-% for message in c.messages:
-<div class="message">
-    <a href=${h.url_for(controller='messager', action='delete',id=message.id) } class="action">[Delete]</a>
- <button dojoType="dijit.form.ToggleButton">
-    <span 
-        %if message.unread:
-        class="unread"
-        %else:
-        class="read"
-        %endif
-        id="span-${message.id}" >${h.msg.get_from(message)} | ${message.date.strftime("%c")} | <span id="subject"> ${message.subject}</span></span>
-
-      <script type="dojo/method" event="onChange">
-          node = "span-${message.id}";
-          if( this.checked )
-          {
-              if( dojo.hasClass( node, "unread") )
-              {
-                  dojo.removeClass( node, "unread");
-                  dojo.addClass( node, "read");
-              }
-              dojo.xhrGet({
-                  url: '${h.url_for(controller='messager', action='getmsg',id=message.id) }',
-                  load: showMessage,
-                  error: helloError,
-                  }).play();
-          }else{
-          dojo.fx.wipeOut({
-              node:"message-${message.id}",
-              }).play();
-          }
-      </script>
-  </button>
-</div>
-  <div id="message-${message.id}" class='message_open' style="display: none;">
-  <button dojoType="dijit.form.Button">Reply
-      <script type="dojo/method" event="onClick">
-      </script>
-  </button>
-  <p id="message-txt-${message.id}"></p>
-  </div>
-<br/>
-% endfor
-<h2>New one</h2>
 <div id="message_list">
     <table id="message_table">