R55687 - in /trunk: calendar/templates/default/ egroupware/api/js/etemplate/ egroupware/api/templates/default/

hnategh-2 2016-04-08 13:47:05 UTC #1

Author: hnategh
New Revision: 55687

URL: http://svn.stylite.de/viewvc/egroupware?rev=55687&view=rev
Log:
Fix et2_file upload

Modified:
trunk/calendar/templates/default/edit.xet
trunk/egroupware/api/js/etemplate/et2_widget_file.js
trunk/egroupware/api/templates/default/etemplate2.css

Modified: trunk/calendar/templates/default/edit.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/default/edit.xet?rev=55687&r1=55686&r2=55687&view=diff

— trunk/calendar/templates/default/edit.xet (original)
+++ trunk/calendar/templates/default/edit.xet Fri Apr 8 15:47:05 2016
@@ -169,9 +169,6 @@

```
  		<row class="th" disabled="@view">
```

  			<description value="Create new links" span="all"/>

  		</row>
  		<row disabled="@view">
  			<link-to id="link_to" span="all"/>
  		</row>

Modified: trunk/egroupware/api/js/etemplate/et2_widget_file.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_widget_file.js?rev=55687&r1=55686&r2=55687&view=diff

— trunk/egroupware/api/js/etemplate/et2_widget_file.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_file.js Fri Apr 8 15:47:05 2016
@@ -180,7 +180,9 @@
$j(span).removeClass(‘et2_file_spanActive’);
}
});

```
  var self = this;
```
```
  // trigger native input upload file
```

  this.span.click(function(){self.input.click()});
  // Check for File interface, should fall back to normal form submit if missing
  if(typeof File != "undefined" && typeof (new XMLHttpRequest()).upload != "undefined")
  {

Modified: trunk/egroupware/api/templates/default/etemplate2.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/templates/default/etemplate2.css?rev=55687&r1=55686&r2=55687&view=diff

— trunk/egroupware/api/templates/default/etemplate2.css (original)
+++ trunk/egroupware/api/templates/default/etemplate2.css Fri Apr 8 15:47:05 2016
@@ -579,7 +579,6 @@
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
max-height: 300px;

width: 181px !important;
z-index: 201 !important;
box-shadow: 6px 6px 9px gray;
}
@@ -593,15 +592,17 @@

.et2_file .progress {
width: 300px;

max-height: 6em;

max-height: 12em;
overflow: auto;
margin-left: 20px;
padding: 8px;
}
.et2_file .progress span.progressBar {
height: 5px;
width: 150px;
max-width: 150px;
display: inline;
border:none;
}
/* Remove icon displayed when hovering */
.et2_file .progress li div.remove {
@@ -647,11 +648,7 @@
margin-top:0;
}
div.et2_file input.et2_file_upload{

position: absolute;
top: 4px;
cursor: pointer;
width: 98%;
opacity: 0;

display: none;
}
/**

Autocomplete - used in link widget
@@ -719,16 +716,15 @@
.et2_link_to {
overflow-x: visible;
}
-.et2_link_to > div {display: inline-block; margin-right:5px;}

-.et2_link_to.et2_toolbar {margin-top:5px !important;}
+.et2_link_to > div {display: inline-block; margin-right:5px;vertical-align: top;}
+
+.et2_link_to.et2_toolbar {margin-top:10px !important;}

.et2_link_to.et2_toolbar div.et2_link_entry input.ui-autocomplete-input {

padding-bottom: 4px;
height:16px;

height:22px;
border-radius: 3px;
}
-.et2_link_to.et2_toolbar .div_link {width:85%;}
+.et2_link_to.et2_toolbar .div_link {width:85%;vertical-align: top;}
.et2_link_to.et2_toolbar .div_link select {margin-right: 4px;}
.et2_link_to button {
display: inline;
@@ -750,6 +746,7 @@
.et2_link_to .progress {
max-height: 12em;
overflow-y: auto;
padding:8px;
}
.et2_link_to .progress > .success input {
width: 100%;
@@ -777,24 +774,28 @@
.et2_link_to button.et2_vfs_btn{
width:24px;
height:24px;
-}
-.et2_link_to div.et2_file,
-.et2_link_to.et2_toolbar div.et2_file,
background-position: center;
background-size: 16px;
padding:0 !important;
vertical-align: bottom;
margin:0;
margin-top:1px;
z-index: 999;
+}
+.et2_link_to.et2_toolbar div.et2_file {width:22px;}

.et2_link_to.et2_toolbar span.et2_file_span {
width:22px;
height: 22px;
background-position: center;
}
.et2_link_to.et2_toolbar div.et2_file {

vertical-align: middle;
margin-top: -4px;

vertical-align: bottom;
padding-right: 2px;
}
.et2_link_to.et2_toolbar button.link {float:right;}

.et2_link_to.et2_toolbar span.et2_file_span { padding-right: 0;}

-.et2_link_to.et2_toolbar .et2_file_upload {padding: 0;margin: 0;}

.et2_link {
cursor: pointer;

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs