R55779 - in /trunk/mail: js/ templates/mobile/ templates/pixelegg/

hnategh-2 2016-04-20 09:54:33 UTC #1

Author: hnategh
New Revision: 55779

URL: http://svn.stylite.de/viewvc/egroupware?rev=55779&view=rev
Log:
Mobile theme W.I.P.:

Fix mail preview does not show calendar meeting mails

Modified:
trunk/mail/js/app.js
trunk/mail/templates/mobile/app.css
trunk/mail/templates/mobile/app.less
trunk/mail/templates/mobile/view.xet
trunk/mail/templates/pixelegg/app.css

Modified: trunk/mail/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/js/app.js?rev=55779&r1=55778&r2=55779&view=diff

— trunk/mail/js/app.js (original)
+++ trunk/mail/js/app.js Wed Apr 20 11:54:33 2016
@@ -5282,9 +5282,24 @@
// Request email body from server
iframe.set_src(egw.link(’/index.php’,{menuaction:‘mail.mail_ui.loadEmailBody’,_messageID:id}));
jQuery(iframe.getDOMNode()).on(‘load’,function(){

  		// Use prepare print function to copy iframe content into div

  		// as we don't want to show content in iframe.

  		self.mail_prepare_print(jQuery(this));

  		if (jQuery(this.contentWindow.document.body).find('#calendar-meeting').length > 0)

```
  		{
```
```
  			var frame = this;
```
```
  			jQuery(this).show();
```

  			// calendar meeting mails still need to be in iframe, therefore, we calculate the height

  			// and set the iframe with a fixed height to be able to see all content without getting

  			// scrollbar becuase of scrolling issue in iframe

  			window.setTimeout(function(){jQuery(frame).height(frame.contentWindow.document.body.scrollHeight);}, 500);

```
  		}
```
```
  		else
```
```
  		{
```

  			// Use prepare print function to copy iframe content into div

  			// as we don't want to show content in iframe (scrolling problem).

  			self.mail_prepare_print(jQuery(this));

```
  		}
```
```
  	});
  });
```
}

Modified: trunk/mail/templates/mobile/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/templates/mobile/app.css?rev=55779&r1=55778&r2=55779&view=diff

— trunk/mail/templates/mobile/app.css (original)
+++ trunk/mail/templates/mobile/app.css Wed Apr 20 11:54:33 2016
@@ -674,6 +674,9 @@
#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject > span {
white-space: nowrap;
}
+#mail-index_mail-index-header_right {

display: inline-flex;
+}
div.mailPreviewHeaders div.mail_extraEmails.visible,
div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
position: absolute;
@@ -1141,7 +1144,7 @@
-moz-transition-timing-function: linear;
-o-transition-timing-function: linear;
transition-timing-function: linear;

background-color: #b4b4b4;

background-color: #e6e6e6;
float: left;
width: 55px;
margin: 3px;
@@ -1991,6 +1994,9 @@
position: relative;
background-color: transparent;
width: 100%;
+}
+#mail-index_mail-index-header_right {
display: inline-flex;
}
#mail-index_mailPreview {
overflow: hidden;
@@ -2589,6 +2595,12 @@
body #popupMainDiv #mail-view_iframe {
display: none;
}
body #popupMainDiv div#mail-view > div {
height: 100%;
}
body #popupMainDiv div#mail-view {
height: 100%;
}
body #popupMainDiv #tempPrintDiv {
display: block;
}

Modified: trunk/mail/templates/mobile/app.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/templates/mobile/app.less?rev=55779&r1=55778&r2=55779&view=diff

— trunk/mail/templates/mobile/app.less (original)
+++ trunk/mail/templates/mobile/app.less Wed Apr 20 11:54:33 2016
@@ -134,6 +134,12 @@
#mail-view_iframe {
display: none;
}

```
  	div#mail-view> div {
```
```
  		height: 100%;
```
```
  	}
```
```
  	div#mail-view {
```
```
  		height: 100%;
```

  	}
  	#tempPrintDiv {
  		display:block;
  		div:first-child {

Modified: trunk/mail/templates/mobile/view.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/templates/mobile/view.xet?rev=55779&r1=55778&r2=55779&view=diff

— trunk/mail/templates/mobile/view.xet (original)
+++ trunk/mail/templates/mobile/view.xet Wed Apr 20 11:54:33 2016
@@ -2,8 +2,8 @@

- - + + @@ -20,7 +20,7 @@ - + @@ -70,7 +70,7 @@ - +