Author: hnategh
New Revision: 55678
URL: http://svn.stylite.de/viewvc/egroupware?rev=55678&view=rev
Log:
Dialog styling W.I.P.:
- New design for link_to widget
Modified:
trunk/egroupware/api/js/etemplate/et2_widget_file.js
trunk/egroupware/api/js/etemplate/et2_widget_link.js
trunk/egroupware/api/js/etemplate/et2_widget_vfs.js
trunk/egroupware/api/templates/default/etemplate2.css
trunk/pixelegg/css/mobile.css
trunk/pixelegg/css/pixelegg.css
trunk/pixelegg/less/etemplate2.less
trunk/pixelegg/mobile/fw_mobile.css
— trunk/egroupware/api/js/etemplate/et2_widget_file.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_file.js Thu Apr 7 19:13:06 2016
@@ -160,8 +160,9 @@
createInputWidget: function() {
this.node = $j(document.createElement(“div”)).addClass(“et2_file”);
this.span = $j(document.createElement(“span”))
-
.addClass('et2_file_span et2_button')
.appendTo (this.node);
-
if (this.options.label != '') this.span.addClass('et2_button_text');
var span = this.span;
this.input = $j(document.createElement("input"))
.attr("type", "file").attr("placeholder", this.options.blur)
— trunk/egroupware/api/js/etemplate/et2_widget_link.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_link.js Thu Apr 7 19:13:06 2016
@@ -127,12 +127,19 @@
},
createInputWidget: function() {
-
this.div = $j(document.createElement("div")).addClass("et2_link_to et2_toolbar");
-
-
// Need a div for file upload widget
-
this.file_div = $j(document.createElement("div")).css({display:'inline-block'}).appendTo(this.div);
-
-
// Filemanager link popup
-
this.filemanager_button = $j(document.createElement("div")).css({display:'inline-block'}).appendTo(this.div);
// One common link button
this.link_button = $j(document.createElement("button"))
.text(this.egw().lang(this.options.link_label))
.appendTo(this.div).hide()
-
.addClass('link')
.click(this, this.createLink);
// Span for indicating status
@@ -141,16 +148,9 @@
// Need a div for link-to widget
this.link_div = $j(document.createElement("div"))
-
.css("width", "89%")
.appendTo(this.div);
-
-
// Filemanager link popup
-
this.filemanager_button = $j(document.createElement("div")).appendTo(this.div);
-
-
// Need a div for file upload widget
-
this.file_div = $j(document.createElement("div")).appendTo(this.div);
this.setDOMNode(this.div[0]);
},
@@ -180,7 +180,8 @@
var select_attrs = {
method: ‘EGroupware\Api\Etemplate\Widget\Link::link_existing’,
method_id: function() { return self.options.value.to_app + ‘:’ + self.options.value.to_id;},
-
button_label: egw.lang('Link')
-
button_label: egw.lang('Link'),
-
button_caption: ''
};
this.vfs_select = et2_createWidget("vfs-select", select_attrs,this);
$j(this.vfs_select.getDOMNode()).change( function() {
@@ -209,7 +210,7 @@
var file_attrs = {
multiple: true,
id: this.id + ‘_file’,
— trunk/egroupware/api/js/etemplate/et2_widget_vfs.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_vfs.js Thu Apr 7 19:13:06 2016
@@ -870,7 +870,7 @@
this.button = $j(document.createElement("button"))
.attr("title", this.egw().lang("Select file(s) from VFS"))
— trunk/egroupware/api/templates/default/etemplate2.css (original)
+++ trunk/egroupware/api/templates/default/etemplate2.css Thu Apr 7 19:13:06 2016
@@ -719,9 +719,19 @@
.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.et2_toolbar div.et2_link_entry input.ui-autocomplete-input {
- padding-bottom: 4px;
- height:16px;
- border-radius: 3px;
+}
+.et2_link_to.et2_toolbar .div_link {width:85%;}
+.et2_link_to.et2_toolbar .div_link select {margin-right: 4px;}
.et2_link_to button {
display: inline;
- float: right;
}
.et2_link_to span.status {
background-repeat: no-repeat;
@@ -765,24 +775,23 @@
width: 22px;
}
.et2_link_to button.et2_vfs_btn{
- float: left;
- margin: 0;
- text-align: left;
- height: 24px !important;
- padding-left: 30px !important;
- background-repeat: no-repeat;
- background-position: 4px center;
- background-size: 20px auto;
- width: 35%;
-}
-.et2_link_to div.et2_file{
- display: inline-block;
- position: relative;
- width:24px;
- height:24px;
+}
+.et2_link_to div.et2_file,
+.et2_link_to.et2_toolbar div.et2_file,
+.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;
- width: 37%;
- margin-left: 8px;
- margin-top: 0;
-}
- margin-top: -4px;
- 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 {
cursor: pointer;
color: #003075;
— trunk/pixelegg/css/mobile.css (original)
+++ trunk/pixelegg/css/mobile.css Thu Apr 7 19:13:06 2016
@@ -321,105 +321,21 @@
*/
.et2_link_to {
min-height: 78px;
- /*
-
.et2_button_icon {
-
.Complete_Button_Icon_normal;
-
float: left;
-
margin: 0px 20px;
-
padding: 3px;
-
.dimension_width_height_m;
-
background-color: @gray_30;
-
&:hover {.Complete_Button_Icon_hover; background-color: @color_positive_action_active !important;}
-
&:active {.Complete_Button_Icon_active; background-color: @color_positive_action_active !important;}
-}*/
- vertical-align: middle;
- background-position: center;
- padding: 0 !important;
- background-size: 16px;
- margin-top: -1px;
- margin-right: 0px;
}
.et2_link_to .et2_file span {
- background-image: url("…/images/upload.png");
- background-image: url("…/images/add.png");
background-position: 4px 2px;
background-size: 16px 16px;
background-repeat: no-repeat;
— trunk/pixelegg/css/pixelegg.css (original)
+++ trunk/pixelegg/css/pixelegg.css Thu Apr 7 19:13:06 2016
@@ -310,105 +310,21 @@
*/
.et2_link_to {
min-height: 78px;
- /*
-
.et2_button_icon {
-
.Complete_Button_Icon_normal;
-
float: left;
-
margin: 0px 20px;
-
padding: 3px;
-
.dimension_width_height_m;
-
background-color: @gray_30;
-
&:hover {.Complete_Button_Icon_hover; background-color: @color_positive_action_active !important;}
-
&:active {.Complete_Button_Icon_active; background-color: @color_positive_action_active !important;}
-}*/
- vertical-align: middle;
- background-position: center;
- padding: 0 !important;
- background-size: 16px;
- margin-top: -1px;
- margin-right: 0px;
}
.et2_link_to .et2_file span {
- background-image: url("…/images/upload.png");
- background-image: url("…/images/add.png");
background-position: 4px 2px;
background-size: 16px 16px;
background-repeat: no-repeat;
— trunk/pixelegg/less/etemplate2.less (original)
+++ trunk/pixelegg/less/etemplate2.less Thu Apr 7 19:13:06 2016
@@ -280,139 +280,80 @@
Link to / Selector Widget
*/
.et2_link_to {
- min-height: 78px;
-
- // Background for select + Search Field
- div:first-child{
-
background-color: @egw_color_1_e;
-
padding: 0.5em 0 0.5em 0.5em;
-
.rounded(5px);
-
}
-
-
// right select field - icon after
-
.et2_link_entry {
-
-
.ui-icon-close {
-
background-color: transparent;
-
left: 0px;
-
}
-
}
-
-
-
// BUTTON: make link button
-
button:first-child {
-
.Complete_Button_normal;
-
padding: 3px;
-
.rounded(5px);
-
.dimension_height_sm;
-
-
position: relative;
-
top: 5px;
-
padding-left: 20px;
-
-
background-image: url("../images/link.png");
-
background-position: 2px 2px;
-
background-size: 14px 14px;
-
background-repeat: no-repeat;
-
-
&:hover {.Complete_Button_Icon_hover; background-color: @color_positive_action_active !important;}
-
&:active {.Complete_Button_Icon_active; background-color: @color_positive_action_active !important;}
-
- }
-
-
- // next line - left
- // et2_vfs_btn
- button.et2_vfs_btn{
-
width: auto;
-
.rounded(5px);
-
position: relative;
-
top: 5px;
-
left: 5px;
- }
-
- .et2_file{
-
background-color: @gray_0 !important;
-
.rounded (5px);
-
left: 0px;
-
margin-left: 60px;
-/* &:hover {background-color: @color_positive_action_active !important;}
-
&:active {background-color: @color_positive_action_active !important;}*/
-
-
-
-
span {
-
background-image: url("../images/upload.png");
-
background-position: 4px 2px;
-
background-size: 16px 16px;
-
background-repeat: no-repeat;
-
.rounded (5px);
-
-
&:hover {background-color: @color_positive_action_active !important;}
-
&:active {background-color: @color_positive_action_active !important;}
-
-
}
-
-
span.et2_file_spanActive{background-color: @color_positive_action_active !important;}
-
-
input{
-
border: none;
-
padding: 1em;
-
-
}
-
-
- }
-
-/*
-
.et2_button_icon {
-
.Complete_Button_Icon_normal;
-
float: left;
-
margin: 0px 20px;
-
padding: 3px;
-
.dimension_width_height_m;
-
background-color: @gray_30;
-
&:hover {.Complete_Button_Icon_hover; background-color: @color_positive_action_active !important;}
-
&:active {.Complete_Button_Icon_active; background-color: @color_positive_action_active !important;}
-}*/
- min-height: 78px;
- // right select field - icon after
- .et2_link_entry {
-
.ui-icon-close {
-
background-color: transparent;
-
left: 0px;
-
}
- }
- // BUTTON: make link button
- button:first-child {
-
- }
- // next line - left
- // et2_vfs_btn
- button.et2_vfs_btn {
-
vertical-align: middle;
-
background-position: center;
-
padding: 0 !important;
-
background-size: 16px;
-
margin-top: -1px;
-
margin-right:0px;
- }
-
- .et2_file {
-
-
span {
-
background-image: url("../images/add.png");
-
background-position: 4px 2px;
-
background-size: 16px 16px;
-
background-repeat: no-repeat;
-
.rounded (5px);
-
-
&:hover {background-color: @color_positive_action_active !important;}
-
&:active {background-color: @color_positive_action_active !important;}
-
}
-
span.et2_file_spanActive{background-color: @color_positive_action_active !important;}
-
input{
-
border: none;
-
padding: 1em;
-
}
- }
}
.et2_link {
- color: @egw_color_2_a;
-}
-.et2_link_list{
-
tr {
-
cursor: pointer;
-
&:hover {background-color: @color_hover_row;}
-
&:active {background-color: @color_active_row;}
-
}
-
-
.icon img,
-
.icon {
-
width: 14px !important;
-
height: 14px !important;
-
}
-
-
td {
-
div.delete {
-
visibility: hidden;
-
background-image: url("../images/close.png");
-
background-position: center;
-
background-repeat: no-repeat;
-
background-size: 16px 16px;
-
background-color: @color_negative_action;
-
padding: 0px;
-
-
&:hover {background-color: @color_negative_action_active !important;}
-
&:active {background-color: @color_negative_action_active !important;}
-
-
}
-
-
}
- color: @egw_color_2_a;
+}
+.et2_link_list {
- tr {
-
cursor: pointer;
-
&:hover {background-color: @color_hover_row;}
-
&:active {background-color: @color_active_row;}
- }
-
- .icon img,
- .icon {
-
width: 14px !important;
-
height: 14px !important;
- }
-
- td {
-
div.delete {
-
visibility: hidden;
-
background-image: url("../images/close.png");
-
background-position: center;
-
background-repeat: no-repeat;
-
background-size: 16px 16px;
-
background-color: @color_negative_action;
-
padding: 0px;
-
-
&:hover {background-color: @color_negative_action_active !important;}
-
&:active {background-color: @color_negative_action_active !important;}
-
}
- }
}
— trunk/pixelegg/mobile/fw_mobile.css (original)
+++ trunk/pixelegg/mobile/fw_mobile.css Thu Apr 7 19:13:06 2016
@@ -332,105 +332,21 @@
*/
.et2_link_to {
min-height: 78px;
- /*
-
.et2_button_icon {
-
.Complete_Button_Icon_normal;
-
float: left;
-
margin: 0px 20px;
-
padding: 3px;
-
.dimension_width_height_m;
-
background-color: @gray_30;
-
&:hover {.Complete_Button_Icon_hover; background-color: @color_positive_action_active !important;}
-
&:active {.Complete_Button_Icon_active; background-color: @color_positive_action_active !important;}
-}*/
- vertical-align: middle;
- background-position: center;
- padding: 0 !important;
- background-size: 16px;
- margin-top: -1px;
- margin-right: 0px;
}
.et2_link_to .et2_file span {
- background-image: url("…/images/upload.png");
- background-image: url("…/images/add.png");
background-position: 4px 2px;
background-size: 16px 16px;
background-repeat: no-repeat;
@@ -2671,7 +2587,7 @@
-
-
@version $Id: layout_content_elements.less 55572 2016-03-31 09:21:55Z ralfbecker $
-
-
@version $Id: layout_content_elements.less 55670 2016-04-07 12:42:27Z hnategh $
/
/ #######################################################################################
@@ -2910,7 +2826,7 @@
-
-
@version $Id: layout_dialog.less 55667 2016-04-07 09:13:26Z hnategh $
-
-
@version $Id: layout_table.less 55667 2016-04-07 09:13:26Z hnategh $
-
-
@version $Id: layout_table.less 55670 2016-04-07 12:42:27Z hnategh $
/
/* #####################################################################################
- et2
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
