Author: ralfbecker
New Revision: 55007
URL: http://svn.stylite.de/viewvc/egroupware?rev=55007&view=rev
Log:
put a single [Add] button left of nm-header (opening selected type or task if not) and show dates popup right aligned
Modified:
trunk/infolog/inc/class.infolog_ui.inc.php
trunk/infolog/js/app.js
trunk/infolog/templates/default/app.css
trunk/infolog/templates/default/index.xet
trunk/infolog/templates/pixelegg/app.css
trunk/infolog/templates/pixelegg/app.less
— trunk/infolog/inc/class.infolog_ui.inc.php (original)
+++ trunk/infolog/inc/class.infolog_ui.inc.php Mon Feb 15 12:59:55 2016
@@ -948,7 +948,6 @@
}
}
}
— trunk/infolog/js/app.js (original)
+++ trunk/infolog/js/app.js Mon Feb 15 12:59:55 2016
@@ -214,6 +214,7 @@
if (filter && dates)
{
dates.set_disabled(false);
@@ -591,7 +592,7 @@
}
}
var extras = {
-
type: _type || nm_value.col_filter.info_type || "task",
cat_id: nm_value.cat_id || "",
action: nm_value.action || _action || "",
// egw_link can handle arrays, but server is expecting CSV
@@ -660,7 +661,7 @@
* Insert text at the cursor position (or end) of a text field
*
* @param {et2_inputWidget|string} widget Either a widget object or it’s ID
-
-
@param {string} [text=timestamp username] Text to insert
-
-
@param {string} text [text=timestamp username] Text to insert
*/
insert_text: function(widget, text)
{
@@ -681,7 +682,7 @@
{
var now = new Date();
text = date(egw.preference(‘dateformat’) + ’ ’ + (egw.preference(“timeformat”) === “12” ? “h:ia” : “H:i”)+’ ',now);
@@ -701,7 +702,7 @@
var browser = ((input.selectionStart || input.selectionStart == “0”) ?
“standards” : (document.selection ? “ie” : false ) );
@@ -713,7 +714,7 @@
}
else if (browser == “standards”)
{
@@ -758,10 +759,10 @@
/**
* Make sure stylite javascript is loaded, and call the given callback when it is
-
-
-
@param {function} callback
-
@param {object} attrs
-
*/
_get_stylite: function(callback,attrs)
{
— trunk/infolog/templates/default/app.css (original)
+++ trunk/infolog/templates/default/app.css Mon Feb 15 12:59:55 2016
@@ -99,4 +99,10 @@
#infolog-index #infolog-index_nm .egwGridView_scrollarea table.egwGridView_grid ul.et2_link_string li.et2_link {
display: inline-block;
+}
+
+div#infolog-index_infolog-index-dates {
- position: absolute;
- right: 12px;
- top: 41px;
}
— trunk/infolog/templates/default/index.xet (original)
+++ trunk/infolog/templates/default/index.xet Mon Feb 15 12:59:55 2016
@@ -2,13 +2,8 @@
-
-
-
-
-
-
-
+
+
@@ -164,7 +159,7 @@
-
+
— trunk/infolog/templates/pixelegg/app.css (original)
+++ trunk/infolog/templates/pixelegg/app.css Mon Feb 15 12:59:55 2016
@@ -39,7 +39,7 @@
}
.normal,
.normal_done {
- color: #000000;
}
.high {
color: #cc0000;
@@ -171,6 +171,11 @@
}
#infolog-index #infolog-index_nm .egwGridView_scrollarea table.egwGridView_grid ul.et2_link_string li.et2_link {
display: inline-block;
+}
+div#infolog-index_infolog-index-dates {
- position: absolute;
- right: 12px;
- top: 41px;
}
/* #############################################################################
// iframe
@@ -240,105 +245,6 @@
position: relative;
top: 5px;
}
-#infolog-index #infolog-index_nm #infolog-index_infolog-index-header_right div.et2_box_widget {
- /border: 1px solid #0C5DA5;/
- /box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);/
- /text-shadow: none;/
- height: 24px;
- margin-top: 0px;
- margin-left: 12px;
- padding: 4px;
- /background-color: @gray_10;/
- position: relative;
- top: 5px;
- -webkit-border-top-right-radius: 3px;
- -webkit-border-bottom-right-radius: 3px;
- -webkit-border-bottom-left-radius: 3px;
- -webkit-border-top-left-radius: 10px;
- -moz-border-radius-topright: 3px;
- -moz-border-radius-bottomright: 3px;
- -moz-border-radius-bottomleft: 3px;
- -moz-border-radius-topleft: 10px;
- border-top-right-radius: 3px;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
- border-top-left-radius: 10px;
- /.background-clip(padding-box);/
- background-image: none !important;
- transition: all 0.5s linear;
- -webkit-transition: all 0.5s linear;
- /* Safari */
- /* &:before {
-
content: "+";
-
font-size: 20px;
-
color: @egw_color_1_a;
-
line-height: 1px;
-
position: relative;
-
top: 2px;
-
text-shadow: 1px 1px 2px #000;*/
- /.Complete_Button_Icon_normal;/
- /.dimension_width_height_sm;/
- /}/
- /Text "“hinzufügen” "/
- /MouseOver/
- /* &:hover {
-
.box_shadow_standard_light_hover;
-
background-color: fade(@egw_color_2_a, 80%) !important;
-
.border_radius_button_lefttop;
-
.dimension_height_sm;
-
-
&:before {content: ""; font-size: 1em;padding-left: 5px;}
-
-
Text
-
span {visibility: hidden; display: none;};
-
img {.scale; margin: 0 5px; background: @gray_0;}
-
}*/
-}
-#infolog-index #infolog-index_nm #infolog-index_infolog-index-header_right div.et2_box_widget span {
- display: none;
-}
-#infolog-index #infolog-index_nm #infolog-index_infolog-index-header_right div.et2_box_widget img {
- /.gradient_vertical (@egw_color_2_a, @egw_color_2_a);/
- /.background_color_10_gray;/
- -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
- box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
- border: 1px solid rgba(0, 0, 0, 0.15);
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- width: 20px;
- height: 20px;
- margin-left: 0.5em;
- padding: 0px;
- margin-top: 0px;
- vertical-align: middle;
-}
-#infolog-index #infolog-index_nm #infolog-index_infolog-index-header_right div.et2_box_widget img:hover {
- /.background_color_20_gray;/
- -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
- -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
- box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
- border: 1px solid rgba(0, 0, 0, 0.5);
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- background-color: #189800;
-}
-#infolog-index #infolog-index_nm #infolog-index_infolog-index-header_right div.et2_box_widget img:active {
- /.background_color_30_gray;/
- border: 1px solid rgba(0, 0, 0, 0.9);
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
- box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
- background-color: #1aa200;
-}
-#infolog-index #infolog-index_nm #infolog-index_infolog-index-header_right div.et2_box_widget img:last-child {
- margin-right: 5px;
-}
#infolog-index #infolog-index_nm table.egwGridView_outer thead tr th.optcol .selectcols {
margin-top: 1.5%;
}
— trunk/infolog/templates/pixelegg/app.less (original)
+++ trunk/infolog/templates/pixelegg/app.less Mon Feb 15 12:59:55 2016
@@ -132,80 +132,6 @@
}
-// box for add stuff
-#infolog-index_infolog-index-header_right{
-div.et2_box_widget{
-
/*border: 1px solid #0C5DA5;*/
-
/*box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);*/
-
/*text-shadow: none;*/
-
.dimension_height_m;
-
margin-top: 0px;
-
margin-left: 12px;
-
padding: 4px;
-
/*background-color: @gray_10;*/
-
position: relative;
-
top: 5px;
-
.border_radius(3px, 3px, 3px, 10px);
-
background-image: none !important;
-
transition: all 0.5s linear;
-
-webkit-transition: all 0.5s linear; /* Safari */
-
-/* &:before {
-
content: "+";
-
font-size: 20px;
-
color: @egw_color_1_a;
-
line-height: 1px;
-
position: relative;
-
top: 2px;
-
text-shadow: 1px 1px 2px #000;*/
-
/*.Complete_Button_Icon_normal;*/
-
/*.dimension_width_height_sm;*/
-
/*}*/
-
-
/*Text ""hinzufügen" "*/
-
span {display: none;}
-
-
-
// IMG
-
img {
-
/*.gradient_vertical (@egw_color_2_a, @egw_color_2_a);*/
-
.Complete_Button_Icon_normal;
-
.dimension_width_height_sm;
-
margin-left: 0.5em;
-
padding: 0px;
-
margin-top: 0px;
-
vertical-align: middle;
-
-
-
&:hover{.Complete_Button_Icon_hover ; background-color: @color_positive_action;}
-
-
&:active { .Complete_Button_Icon_active ; background-color: @color_positive_action_active;}
-
}
-
-
img:last-child {margin-right: 5px;};
-
-
-
-
/*MouseOver*/
-/* &:hover {
-
.box_shadow_standard_light_hover;
-
background-color: fade(@egw_color_2_a, 80%) !important;
-
.border_radius_button_lefttop;
-
.dimension_height_sm;
-
-
&:before {content: ""; font-size: 1em;padding-left: 5px;}
-
-
Text
-
span {visibility: hidden; display: none;};
-
img {.scale; margin: 0 5px; background: @gray_0;}
-
}*/
-
}
-}// END BOX WIDGET
// ##################################
// Listendarstellung
.egwGridView_outer {}
@@ -407,7 +333,7 @@
/* tablets and smartphones */
@media only screen and (max-device-width:1024px) {
-
#infolog-index_nm .gridCont_0_div_col_0.innerContainer {
min-width: auto;
}
@@ -451,7 +377,7 @@
overflow: hidden;
padding-right: 8px;
}
- }
ul[id^=‘infolog-index_’][id$=‘filelinks]’]
{
white-space: nowrap !important;
@@ -460,7 +386,7 @@
span[id^=‘infolog-index_’][id$=‘info_subject]’] {
white-space: nowrap;
}
- }
label[id^=‘infolog-index_’][id$=‘info_link]’]
{
white-space: nowrap;
@@ -470,7 +396,7 @@
.mob-fontsize-s;
font-weight: normal;
}
- infolog_rowHasSubs span.arrow,
- infolog_rowHasSubs span.arrow,
table.egwGridView_grid span.arrow.closed{
display: none !important;
}
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
