]> err.no Git - scalable-opengroupware.org/commitdiff
projects / scalable-opengroupware.org / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9edc5a9)
work on layout
authorhelge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Tue, 26 Oct 2004 12:53:37 +0000 (12:53 +0000)
committerhelge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Tue, 26 Oct 2004 12:53:37 +0000 (12:53 +0000)
git-svn-id: http://svn.opengroupware.org/SOGo/trunk@424 d1b88da0-ebda-0310-925b-ed51d893ca5b

SOGo/UI/Mailer/ChangeLog patch | blob | history
SOGo/UI/Mailer/README patch | blob | history
SOGo/UI/Mailer/UIxMailEditorAttach.m patch | blob | history
SOGo/UI/Mailer/UIxMailEditorAttach.wox patch | blob | history
SOGo/UI/Mailer/Version patch | blob | history
SOGo/UI/Mailer/mailer.css patch | blob | history
SOGo/UI/Mailer/product.plist patch | blob | history

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 121db387ad293b1eec709a34124976929e6c1426..7152649e6e3d7113d3e08a584292a1dc3cb46e50 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-26  Helge Hess  <helge.hess@opengroupware.org>
 
+       * UIxMailEditorAttach.wox, mailer.css: work on layout, added delete
+         action (v0.9.47)
+
        * added new UIxMailEditorAttach component to manage draft attachments
          (v0.9.46)
 
diff --git a/SOGo/UI/Mailer/README b/SOGo/UI/Mailer/README
index f4d6165fc920989084f1b2058c263b3b7e3d11da..01404aedccfed36396de74f621be5ec8228286e8 100644 (file)
--- a/SOGo/UI/Mailer/README
+++ b/SOGo/UI/Mailer/README
@@ -7,6 +7,7 @@ SOGO Mailer UI
 TODO
 ====
 - a lot ;->
+- SOPE: does not recognize <input type="button"> !
 
 Components
 ==========
diff --git a/SOGo/UI/Mailer/UIxMailEditorAttach.m b/SOGo/UI/Mailer/UIxMailEditorAttach.m
index 54525848595cc951c752bc66b084f7dd30de3b20..efae6dfaf1cea88e8821bd7f0ed0fd84d6ac3cbc 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditorAttach.m
+++ b/SOGo/UI/Mailer/UIxMailEditorAttach.m
@@ -39,6 +39,7 @@
   NSData   *fileData1;
   NSData   *fileData2;
   NSData   *fileData3;
+  NSString *attachmentName;
 }
 
 @end
@@ -49,6 +50,7 @@
 @implementation UIxMailEditorAttach
 
 - (void)dealloc {
+  [self->attachmentName release];
   [self->filePath1 release];
   [self->filePath2 release];
   [self->filePath3 release];
@@ -60,6 +62,13 @@
 
 /* accessors */
 
+- (void)setAttachmentName:(NSString *)_value {
+  ASSIGNCOPY(self->attachmentName, _value);
+}
+- (NSString *)attachmentName {
+  return self->attachmentName;
+}
+
 - (void)setFilePath1:(NSString *)_value {
   ASSIGNCOPY(self->filePath1, _value);
 }
@@ -138,4 +147,9 @@
   return self;
 }
 
+- (id)deleteAttachmentAction {
+  [self logWithFormat:@"delete attachment: %@", [self attachmentName]];
+  return self;
+}
+
 @end /* UIxMailEditorAttach */
diff --git a/SOGo/UI/Mailer/UIxMailEditorAttach.wox b/SOGo/UI/Mailer/UIxMailEditorAttach.wox
index fbb566d1dca379be2acc8ccaca318db321004b37..d0c4aa5f5e7a82c3ea10591719236d9c71bf5f80 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditorAttach.wox
+++ b/SOGo/UI/Mailer/UIxMailEditorAttach.wox
@@ -17,42 +17,74 @@
     <link href="mailto:info@skyrix.com" rev="made"/>
   </head>
 
-  <body style="background-color: #D4D0C8;">
+  <body id="attachment_body" style="background-color: #D4D0C8;">
     <form name="pageform" href="attach" sidInUrl="NO"
           method="POST"
-          enctype="multipart/form-data">
-      <h4>Attach</h4>
-      <table border="0" width="98%">
-        <tr>
-          <td><input type="file" name="file1" 
-                     var:filePath="filePath1"
-                     var:data="fileData1" /></td>
-        </tr>
-        <tr>
-          <td><input type="file" name="file2" 
-                     var:filePath="filePath2"
-                     var:data="fileData2" /></td>
-        </tr>
-        <tr>
-          <td><input type="file" name="file3" 
-                     var:filePath="filePath3"
-                     var:data="fileData3" /></td>
-        </tr>
-      </table>
-
-      <input type="submit" name="submit" value="attach" />
-      <br />
-
-      <h4>Attachments</h4>
-
-      <div style="border-top-color: white; border-top-width: 1; border-top-style: solid;"> </div>
-      <table border="0" width="98%">
-        <var:foreach list="clientObject.fetchAttachmentNames" item="item">
+          enctype="multipart/form-data"
+          id="attachment_form"
+    >
+      <div id="attachment_upload">
+        <table border="0" width="98%">
+          <tr>
+            <td class="attachment_uplabel">File:</td>
+            <td><input type="file" name="file1"
+                       var:filePath="filePath1"
+                       var:data="fileData1" /></td>
+          </tr>
           <tr>
-            <td><var:string value="item" /></td>
+            <td class="attachment_uplabel">File:</td>
+            <td><input type="file" name="file2"
+                       var:filePath="filePath2"
+                       var:data="fileData2" /></td>
           </tr>
-        </var:foreach>
-      </table>
+          <tr>
+            <td class="attachment_uplabel">File:</td>
+            <td><input type="file" name="file3" 
+                       var:filePath="filePath3"
+                       var:data="fileData3" /></td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>
+              <input type="submit" name="submit" value="attach" />
+              <input type="reset"  value="close" 
+                     onclick="window.close()" />
+            </td>
+          </tr>
+        </table>
+      </div>
+  
+      <div id="attachment_list">
+       <div style="padding: 4px;">
+
+        <div class="embedwhite_out">
+          <div class="embedwhite_in">
+            <table border="0" width="100%" cellspacing="0" cellpadding="1">
+              <tr class="tableview">
+                <td class="tbtv_headercell">
+                  Attachments
+                </td>
+                <td class="tbtv_headercell" width="10%">
+                  <entity name="nbsp" />
+                </td>
+              </tr>
+  
+              <var:foreach list="clientObject.fetchAttachmentNames" 
+                           item="attachmentName">
+                <tr class="tableview">
+                  <td><var:string value="attachmentName" /></td>
+                  <td>
+                    <a href="deleteAttachment" 
+                       var:_attachmentName="attachmentName"
+                       >delete</a>
+                  </td>
+                </tr>
+              </var:foreach>
+            </table>
+          </div>
+        </div>
+       </div>
+      </div>
     </form>
   </body>
 </html>
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 1493e282d825f586287c9658e418c2fc4deb9840..ea2cd5d944558c4c3c17a9964750238ff9edad00 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=46
+SUBMINOR_VERSION:=47
 
 # v0.9.43 requires NGObjWeb v4.3.73
 # v0.9.42 requires NGObjWeb v4.3.72
diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/Mailer/mailer.css
index 81f56581e1fd1cbaa24b4e54649a8ec3c53f832c..37d00d0cf10be28ddc98b961ede08912f1d1902c 100644 (file)
--- a/SOGo/UI/Mailer/mailer.css
+++ b/SOGo/UI/Mailer/mailer.css
@@ -343,3 +343,33 @@ div#compose_text textarea {
   width:  100%;
   height: 280px;
 }
+
+/* attachment editor */
+
+form#attachment_form { 
+  background-color: #D4D0C8;
+  padding: 1px;
+}
+
+div#attachment_list { 
+  border-top-color:    white;
+  border-top-width:    1;
+  border-top-style:    solid;
+}
+
+form#attachment_form input {
+  font-size: 10px;
+}
+
+div#attachment_upload { 
+  border-bottom-color: #808080;
+  border-bottom-width: 1;
+  border-bottom-style: solid;
+  padding: 4px;
+}
+
+td.attachment_uplabel { 
+  width:      15%;
+  font-size:  11px;
+  text-align: left;
+}
diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist
index fa2974752cc2a047cc72c3c42e56c3364c48bb58..a9f84089b8c8fe379ae3479bc6c9e9ec1c935af3 100644 (file)
--- a/SOGo/UI/Mailer/product.plist
+++ b/SOGo/UI/Mailer/product.plist
@@ -347,6 +347,7 @@
           pageName    = "UIxMailEditor"; 
           actionName  = "save";
         };
+
         viewAttachments = {
           protectedBy = "View";
           pageName    = "UIxMailEditorAttach"; 
@@ -357,6 +358,12 @@
           pageName    = "UIxMailEditorAttach"; 
           actionName  = "attach";
         };
+        deleteAttachment = {
+          protectedBy = "View";
+          pageName    = "UIxMailEditorAttach"; 
+          actionName  = "deleteAttachment";
+        };
+
         send = {
           protectedBy = "View";
           pageName    = "UIxMailEditor"; 
Unnamed repository; edit this file to name it for gitweb.