Multiple enhancements according to redmine feature requests

This commit is contained in:
Christian Wolf 2017-12-01 17:40:09 +01:00
parent 1999c7efc3
commit cefebb1288
9 changed files with 183 additions and 15 deletions

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<buildpath>
<buildpathentry kind="src" path=""/>
<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
<buildpathentry kind="src" path=""/>
</buildpath>

View File

@ -23,7 +23,7 @@ Structure of page
flex: 0 0 auto;
display: flex;
flex-flow: row nowrap;
justify-content: space-around;
justify-content: space-between;
position: relative;
align-items: center;
}
@ -110,10 +110,21 @@ Structure of page
display: block;
}
#mobile_menu {
#mobile_menu,
#mobile_menu.visible,
#mobile_menu_switch
{
display: none;
}
a.facebook img
{
display: inline;
}
a.facebook > span.image-title
{
display: none;
}
@ -138,10 +149,10 @@ body
}
#topmenu .nav {
padding: 0px;
padding: 0px 10px;
margin: 0px;
height: 40px;
width: 1000px;
width: 980px;
}
#topmenu .nav > li > a {
@ -228,7 +239,6 @@ body
/*
Additional content
*/

View File

@ -30,11 +30,15 @@ body {
* Menu configuration
*/
.nav, .nav-child {
.nav,
.nav-child
{
padding: 0px;
}
.nav > li, .nav-child > li {
.nav > li,
.nav-child > li
{
display: block;
}
@ -180,6 +184,12 @@ body {
#mobile_menu {
margin-top: 10px;
display: none;
}
#mobile_menu.visible
{
display: block;
}
#mobile_menu li > a {
@ -220,6 +230,24 @@ body {
padding-right: 0px;
}
#mobile_menu_switch
{
flex: 0 0 auto;
text-align: right;
}
#btn_mobile_menu
{
padding: 10px 30px 0px 0px;
width: 40px;
box-sizing: initial;
}
a.facebook img
{
display: none;
}
/*
* Debug
*/

View File

@ -93,13 +93,32 @@ ul.nav-child > li > a:hover
text-decoration: none;
}
#topmenu .nav > li,
#topmenu .nav-child > li
{
padding: 0px;
border-style: none;
}
#left_side, #right_side
{
background-repeat: no-repeat;
background-size: cover;
}
#left_menu .nav > li,
#left_menu .nav-child > li
{
padding: 5px 0px;
border-top-style: solid;
border-width: 1px;
}
#left_menu .nav > li:first-child,
#left_menu .nav-child > li:first-child
{
border-top-style: none;
}
/*
<?php

View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="50"
height="50"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="mobile_menu.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.2"
inkscape:cx="15.787585"
inkscape:cy="23.329513"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1637"
inkscape:window-height="1026"
inkscape:window-x="1963"
inkscape:window-y="24"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1002.3622)">
<rect
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.01144552;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="rect2985"
width="35.289841"
height="5.7500229"
x="7.6452589"
y="1010.4987" />
<rect
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.01144552;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="rect2985-3"
width="35.289841"
height="5.7500229"
x="7.6452589"
y="1024.4872" />
<rect
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.01144552;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="rect2985-6"
width="35.289841"
height="5.7500229"
x="7.6452589"
y="1038.4757" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -9,6 +9,9 @@ $app = JFactory::getApplication();
JHtml::_('bootstrap.framework');
JHtml::_('bootstrap.loadCss', true, $this->direction);
// Add jQuery framework
JHtml::_('jquery.framework');
// Add template js
//JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
@ -19,6 +22,9 @@ JHtml::_('bootstrap.loadCss', true, $this->direction);
JHtml::_('stylesheet', 'templates/system/css/system.css', array('version' => 'auto', 'relative' => false));
JHtml::_('stylesheet', 'main.css', array('version' => 'auto', 'relative' => true));
// Add Javascript for mobile menu
JHtml::_('script', 'mobile.js', array('version' => 'auto', 'relative' => 'true'));
// Check for a custom CSS file
JHtml::_('stylesheet', 'user.css', array('version' => 'auto', 'relative' => true));
@ -79,12 +85,8 @@ ul.menu {
color: <?php echo $params{'fgcolor1'}; ?>;
}
ul.menu li.active > a {
background-color: <?php echo $params{'bgcolor2'}; ?>;
color: <?php echo $params{'fgcolor2'}; ?>;
}
ul.menu li.current > a
ul.menu li.current > a,
ul.menu li.current:hover > a
{
background-color: <?php echo $params{'bgcolor2'}; ?>;
color: <?php echo $params{'fgcolor2'}; ?>;
@ -174,6 +176,7 @@ print_r($this->params);
</div> <!-- #slideshow -->
</div> <!-- #header -->
<div id='mobile_menu_switch'><?php echo JHtml::_('image', 'mobile_menu.svg', 'Menu', array('width' => '40px', 'id' => 'btn_mobile_menu'), true);?></div>
<div id='mobile_menu'>
<jdoc:include type="modules" style="none" name="mobile_menu" />
</div>

31
slt/js/mobile.js Normal file
View File

@ -0,0 +1,31 @@
jQuery(function($){
$('#btn_mobile_menu').click(function(){
$('#mobile_menu').toggle({
duration: '400',
easing: 'linear',
complete: function(){
$('#mobile_menu').toggleClass('visible');
$('#mobile_menu').css('display','');
}
});
// if($('#mobile_menu').hasClass('visible')) {
//
// } else {
//
// }
// $('#mobile_menu').toggleClass('visible',{
// queue: false,
// duration: '400',
// easing: 'easeInOutSine',
// complete: function(){
// $('#mobile_menu').css('display', '');
// }
// });
});
});

View File

@ -26,7 +26,7 @@
<!-- Der Folder-Tag weist Joomla an, den Ordner bspw. html samt dem Inhalt im Template-Ordner zu Speichern -->
<!--<folder>html</folder>-->
<folder>css</folder>
<folder>img</folder>
<folder>images</folder>
<folder>language</folder>
<folder>js</folder>
<folder>html</folder>