extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mobile theme W.I.P:

Browse Source 
- Fix calendar toolbar messed up with too many shown actions
- Fix SVG icons for list, planner, 4days, multiweek and today buttons
This commit is contained in:
Hadi Nategh 2016-03-29 10:33:10 +00:00
parent 4f3eb21e84
commit 989d1ca389
8 changed files with 93 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/templates/default/etemplate2.css
View File

@ -1826,6 +1826,7 @@ div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
vertical-align: top; vertical-align: top;
width:auto; width:auto;
padding-left: 3px; padding-left: 3px;
background-image: none;
} }
.et2_toolbar button, .nextmatch_header_row button, .et2_toolbar div.et2_progress, .nextmatch_header_row div.et2_progress { .et2_toolbar button, .nextmatch_header_row button, .et2_toolbar div.et2_progress, .nextmatch_header_row div.et2_progress {
margin: 1px 4px 1px 0; margin: 1px 4px 1px 0;

19
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -319,7 +319,7 @@ class calendar_uiviews extends calendar_ui
), ),
'planner_category' => array( 'planner_category' => array(
'caption' => 'Planner by category', 'caption' => 'Planner by category',
'icon' => 'planner', 'icon' => 'planner_category',
'group' => $group, 'group' => $group,
'onExecute' => 'javaScript:app.calendar.toolbar_action', 'onExecute' => 'javaScript:app.calendar.toolbar_action',
'hint' => 'Planner by category', 'hint' => 'Planner by category',
@ -388,7 +388,20 @@ class calendar_uiviews extends calendar_ui
'toolbarDefault' => true, 'toolbarDefault' => true,
), ),
); );
if (html::$ua_mobile)
{
foreach (array_keys($actions) as $key)
{
if (!in_array($key, array('add','weekend','next', 'today','previous'))) {
$actions[$key]['toolbarDefault'] = false;
}
else {
$actions[$key]['toolbarDefault'] = true;
}
}
$actions['weekend']['data'] = array('toggle_off' => '7', 'toggle_on' => '5');
unset($actions['pgp']);
}
return $actions; return $actions;
} }
@ -1717,7 +1730,7 @@ class calendar_uiviews extends calendar_ui
} }
return ''; return '';
} }
/** /**
* Calculates a brighter color for a given color * Calculates a brighter color for a given color
* *

14
calendar/templates/pixelegg/images/cal4.svg
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?> <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
<svg version="1.1" id="calendar_cal4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" id="calendar_cal4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"> width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
<g>
<g> <g>
<path fill="#696969" stroke="#E6E6E6" stroke-miterlimit="10" d="M25.007,0.996H15.004v3.001h9.003c1.656,0,3,1.343,3,3v18.002 <g>
c0,1.658-1.344,3.002-3,3.002H6.003c-1.657,0-3.001-1.344-3.001-3.002V23H0v3.001c0,2.762,2.24,5.002,5.003,5.002h20.004 <path fill="#696969" stroke="#E6E6E6" stroke-miterlimit="10" d="M25.007,0.996H15.004v3.001h9.003c1.656,0,3,1.343,3,3v18.002
c2.763,0,5.001-2.24,5.001-5.001V5.998C30.008,3.235,27.77,0.996,25.007,0.996z M8.311,19.804h3.605v-4.031h2.119v-2.881h-2.119 c0,1.658-1.344,3.002-3,3.002H6.003c-1.657,0-3.001-1.344-3.001-3.002V23H0v3.001c0,2.762,2.24,5.002,5.003,5.002h20.004
V1.183H7.781L0.894,12.554v3.218h7.417V19.804z M3.635,12.89l4.676-8.071v8.071H3.635z"/> c2.763,0,5.001-2.24,5.001-5.001V5.998C30.008,3.235,27.77,0.996,25.007,0.996z M8.311,19.804h3.605v-4.031h2.119v-2.881h-2.119
V1.183H7.781L0.894,12.554v3.218h7.417V19.804z M3.635,12.89l4.676-8.071v8.071H3.635z"/>
</g>
</g> </g>
</g>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

25
calendar/templates/pixelegg/images/day.svg
View File

@ -1,17 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?> <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
<svg version="1.1" id="calendar_day" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"> width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
<g>
<g> <g>
<path fill-rule="evenodd" clip-rule="evenodd" fill="#696969" d="M23.084,8c1.104,0,2-0.896,2-2V3c0-1.104-0.896-2-2-2 <g>
c-1.105,0-2,0.896-2,2v3C21.084,7.104,21.979,8,23.084,8z M9.083,8c1.104,0,2-0.896,2-2V3c0-1.104-0.896-2-2-2s-2,0.896-2,2v3 <path fill="#696969" stroke="#E6E6E6" stroke-miterlimit="10" d="M26.001,1.001H16v3h9.001c1.657,0,3,1.343,3,3V25
C7.083,7.104,7.979,8,9.083,8z M27.084,4h-1v3c0,1.104-0.896,2-2,2h-2c-1.105,0-2-0.896-2-2V4h-8v3c0,1.104-0.896,2-2,2h-2 c0,1.657-1.343,3-3,3H7c-1.656,0-3-1.343-3-3v-2H1v3c0,2.762,2.238,5,5,5h20.001c2.761,0,5-2.238,5-5V6.001
c-1.104,0-2-0.896-2-2V4h-1c-1.104,0-2,0.896-2,2v23c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V6 C31.001,3.239,28.762,1.001,26.001,1.001z M7.374,19.986h3.614V1.014H8.02C7.941,2.43,7.013,4.301,3.527,4.301H3.012v2.619h4.362
C29.084,4.896,28.188,4,27.084,4z M12.083,28h-6v-5h6V28z M12.083,22h-6v-5h6V22z M12.083,16h-6v-5h6V16z M19.084,28h-6v-5h6V28z V19.986z"/>
M19.084,22h-6v-5h6V22z M19.084,16h-6v-5h6V16z M26.084,28h-6v-5h6V28z M26.084,16h-6v-5h6V16z"/> </g>
</g>
<g>
<g>
<path fill="#696969" stroke="#E6E6E6" stroke-miterlimit="10" d="M64.256,3.382L51.448,3.375l-0.005,10.001H51.44l-0.002,2.658
l5.199-5.132c1.181,1.519,1.89,3.414,1.889,5.478c-0.003,4.97-4.083,8.998-9.112,8.995c-5.031-0.002-9.106-4.034-9.104-9.004
c0.002-3.917,2.54-7.239,6.076-8.474l0.002-4.161c-5.801,1.353-10.124,6.487-10.127,12.633c-0.004,7.18,5.884,13.003,13.15,13.007
c7.266,0.004,13.158-5.813,13.162-12.993c0.002-3.168-1.146-6.071-3.052-8.327L64.256,3.382z"/>
</g>
</g> </g>
</g>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

13
calendar/templates/pixelegg/images/list.svg Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<?xml-stylesheet type="text/css" href="../less/svg.css" ?>
<svg version="1.1" id="pixelegg_list" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
<g>
<g>
<path fill="#696969" stroke="#E6E6E6" stroke-miterlimit="10" d="M1,1v6.521h30V1H1z M1,19.262h30V12.74H1V19.262z M1,31h30v-6.521H1
V31z"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 711 B

2
calendar/templates/pixelegg/images/mutliweek.svg → calendar/templates/pixelegg/images/multiweek.svg
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?> <?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
<svg version="1.1" id="calendar_mutliweek" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" id="calendar_mutliweek" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"> width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
<g> <g>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 918 B

After

Width:  |  Height:  |  Size: 919 B

23
calendar/templates/pixelegg/images/planner.svg Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
<g>
<g>
<path fill="#696969" stroke="#E6E6E6" stroke-miterlimit="10" d="M13.794,6.559c0.05,0.299,0,1.16,0,1.474
c0,0.234-0.078,0.536-0.22,0.868c0.595,0.409,1.293,0.686,2.082,0.686c1.147,0,2.109-0.577,2.83-1.309
c1.56-0.17,2.683-0.409,2.683-0.409c-0.438-0.411-0.877-1.189-1.259-2.02c0.021-0.101,0.034-0.194,0.034-0.271
c0-0.244,0.04-0.915,0-1.147c-0.341-1.966-2.212-3.436-4.288-3.436c-1.682,0-3.204,0.923-3.91,2.315
C12.798,4.104,13.566,5.24,13.794,6.559z M12.398,10.616c-0.545,0.562-1.236,1.078-2.051,1.417
c2.631,0.374,4.849,1.302,4.849,1.302l1.005,2.552h6.805l-1.838-4.582c0,0-2.784-1.146-5.512-1.146
C14.561,10.159,13.383,10.374,12.398,10.616z M25.991,0.996h-4.976v2.985h3.981c1.648,0,2.985,1.336,2.985,2.985v17.91
c0,1.648-1.337,2.985-2.985,2.985H7.084c-1.648,0-2.985-1.337-2.985-2.985v-4.976H1.114v5.971c0,2.748,2.228,4.976,4.976,4.976
h19.902c2.748,0,4.977-2.228,4.977-4.976v-19.9C30.968,3.223,28.739,0.996,25.991,0.996z M15.656,18.178l-1.838-4.582
c0,0-2.784-1.146-5.513-1.146c-2.535,0-5.513,1.146-5.513,1.146l-1.838,4.582c0,0,3.659,0.574,7.351,0.574
C11.963,18.752,15.656,18.178,15.656,18.178z M8.305,11.305c2.625,0,4.287-2.455,4.287-3.437c0-0.244,0.042-0.914,0-1.146
c-0.34-1.967-2.211-3.436-4.287-3.436c-2.104,0-3.98,1.431-4.288,3.436c-0.032,0.207,0,0.929,0,1.146
C4.018,8.851,5.679,11.305,8.305,11.305z"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

17
calendar/templates/pixelegg/images/today.svg Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<?xml-stylesheet type="text/css" href="../../../../pixelegg/less/svg.css" ?>
<svg version="1.1" id="calendar_day" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
<g>
<g>
<path fill-rule="evenodd" clip-rule="evenodd" fill="#696969" d="M23.084,8c1.104,0,2-0.896,2-2V3c0-1.104-0.896-2-2-2
c-1.105,0-2,0.896-2,2v3C21.084,7.104,21.979,8,23.084,8z M9.083,8c1.104,0,2-0.896,2-2V3c0-1.104-0.896-2-2-2s-2,0.896-2,2v3
C7.083,7.104,7.979,8,9.083,8z M27.084,4h-1v3c0,1.104-0.896,2-2,2h-2c-1.105,0-2-0.896-2-2V4h-8v3c0,1.104-0.896,2-2,2h-2
c-1.104,0-2-0.896-2-2V4h-1c-1.104,0-2,0.896-2,2v23c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V6
C29.084,4.896,28.188,4,27.084,4z M12.083,28h-6v-5h6V28z M12.083,22h-6v-5h6V22z M12.083,16h-6v-5h6V16z M19.084,28h-6v-5h6V28z
M19.084,22h-6v-5h6V22z M19.084,16h-6v-5h6V16z M26.084,28h-6v-5h6V28z M26.084,16h-6v-5h6V16z"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB