Merge branch 'redesign2018' of /media/sdb1/judoRepo into redesign2018
Conflicts: homepage/redesign2018/markdownExperiment/wkParticipo/index.php
This commit is contained in:
marko
@@ -187,6 +187,8 @@ $htmlWkTableString = "";
|
|||||||
str_replace("pokal", "­pokal", $wk['Veranstaltung']);
|
str_replace("pokal", "­pokal", $wk['Veranstaltung']);
|
||||||
$wk['Veranstaltung'] =
|
$wk['Veranstaltung'] =
|
||||||
str_replace("randori", "­randori", $wk['Veranstaltung']);
|
str_replace("randori", "­randori", $wk['Veranstaltung']);
|
||||||
|
$wk['Veranstaltung'] =
|
||||||
|
str_replace("spiele", "­spiele", $wk['Veranstaltung']);
|
||||||
|
|
||||||
$htmlWkTableString .=
|
$htmlWkTableString .=
|
||||||
"<tr>".
|
"<tr>".
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
|
||||||
require_once('./local/wkParticipoConf.php.inc');
|
require_once('./local/wkParticipoConf.php.inc');
|
||||||
require_once('./auth.php');
|
require_once('./auth.php');
|
||||||
require_once('./local/db.php.inc');
|
require_once('./local/db.php.inc');
|
||||||
@@ -24,12 +25,13 @@
|
|||||||
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
|
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
|
||||||
|
|
||||||
<link rel="stylesheet" href="style.css">
|
<link rel="stylesheet" href="style.css">
|
||||||
|
<link rel="stylesheet" href="wkParticipo.css">
|
||||||
<link rel="stylesheet" href="http://cwsvjudo.bplaced.net/ressourcen/css/cwsvJudoNavBar.css">
|
<link rel="stylesheet" href="http://cwsvjudo.bplaced.net/ressourcen/css/cwsvJudoNavBar.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php echo $login_status; ?>
|
<?php echo $login_status; ?>
|
||||||
|
|
||||||
<h1>Wettkampfplanung - Übersicht</h1>
|
<h1>Wettkampf­planung - Übersicht</h1>
|
||||||
|
|
||||||
|
|
||||||
<nav class="navBar">
|
<nav class="navBar">
|
||||||
@@ -91,32 +93,45 @@
|
|||||||
else{
|
else{
|
||||||
foreach($wkEventData as $wkEvent){
|
foreach($wkEventData as $wkEvent){
|
||||||
?>
|
?>
|
||||||
<h4><?php echo mb_convert_encoding($wkEvent['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?></h4>
|
<div class="wkInfoCard">
|
||||||
<div class="wkBox">
|
<time class="wkInfoCardDate" datetime="<?php echo( $wkEvent['Datum'] );?>">
|
||||||
<div class="wkInfo"><ul>
|
<span class="wkInfoCardDateWeekday">
|
||||||
<li>Datum: <time datetime="<?php echo mb_convert_encoding($wkEvent['Datum'], 'UTF-8', 'ISO-8859-1');?>"><?php echo mb_convert_encoding($wkEvent['Datum'], 'UTF-8', 'ISO-8859-1');?></time></li>
|
<?php echo( strftime("%a", strtotime($wkEvent['Datum'])));?>
|
||||||
<li>Altersklassen: <?php echo mb_convert_encoding($wkEvent['Altersklassen'], 'UTF-8', 'ISO-8859-1');?></li>
|
</span>
|
||||||
<li>Eingeschrieben als: <?php echo($startTyp[$wkEvent['type']]);?></li>
|
<span class="wkInfoCardDateDay">
|
||||||
</ul></div>
|
<?php echo( strftime("%d", strtotime($wkEvent['Datum'])));?>
|
||||||
<nav>
|
</span>
|
||||||
<ul>
|
<span class="wkInfoCardDateMonth">
|
||||||
<li>
|
<?php echo( strftime("%b", strtotime($wkEvent['Datum'])));?>
|
||||||
<a href ="./showWkEvent.php?eventId=<?php echo $wkEvent['eventId']?>">
|
</span>
|
||||||
<div>Detailansicht</div>
|
<span class="wkInfoCardDateYear">
|
||||||
|
<?php echo( strftime("%Y", strtotime($wkEvent['Datum'])));?>
|
||||||
|
</span>
|
||||||
|
</time>
|
||||||
|
|
||||||
|
<div class="wkInfoCardWkData">
|
||||||
|
<div class="wkInfoCardWkInfo">
|
||||||
|
<h4 class="fontWeightLighter" ><?php echo( $wkEvent['Veranstaltung'] );?></h4>
|
||||||
|
<ul>
|
||||||
|
<li>Datum: <time datetime="<?php echo( $wkEvent['Datum'] );?>"><?php echo( $wkEvent['Datum'] );?></time></li>
|
||||||
|
<li>Altersklassen: <?php echo( $wkEvent['Altersklassen'] );?></li>
|
||||||
|
<li>Eingeschrieben als: <?php echo( $startTyp[$wkEvent['type']] );?></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="wkInfoCardButtonBar">
|
||||||
|
<a href ="./showWkEvent.php?eventId=<?php echo $wkEvent['eventId']?>" class="wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised">
|
||||||
|
Detailansicht
|
||||||
</a>
|
</a>
|
||||||
</li>
|
<a href ="/ressourcen/phpLib/calendar.php?wkID=<?php echo $wkEvent['lfdeNr']?>" class="wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised">
|
||||||
<li>
|
Termin als iCal
|
||||||
<a href ="/ressourcen/phpLib/calendar.php?wkID=<?php echo $wkEvent['lfdeNr']?>">
|
|
||||||
<div>Termin als iCal</div>
|
|
||||||
</a>
|
</a>
|
||||||
</li>
|
<a href ="<?php echo( addToGcalUrl( $wkEvent['Veranstaltung'], $wkEvent['Datum'] ) );?>" class="wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised">
|
||||||
<li>
|
In den Google Calendar
|
||||||
<a href ="<?php echo(addToGcalUrl(mb_convert_encoding($wkEvent['Veranstaltung'], 'UTF-8', 'ISO-8859-1'), mb_convert_encoding($wkEvent['Datum'], 'UTF-8', 'ISO-8859-1') ));?>">
|
|
||||||
<div>In den Google Calendar</div>
|
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</div>
|
||||||
</ul>
|
</div>
|
||||||
</nav>
|
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
/* blau: #291670 */
|
||||||
|
/* gelb: #fff500*/
|
||||||
|
|
||||||
|
.wkInfoCard{
|
||||||
|
border-left: .5rem solid #291670;
|
||||||
|
margin: 1rem 0;
|
||||||
|
display: flex;
|
||||||
|
background-color: #FFAE00;
|
||||||
|
border-radius: 2px;
|
||||||
|
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.16),
|
||||||
|
0 2px 10px 0 rgba(0, 0, 0, 0.12);
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
a{
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardDate{
|
||||||
|
align-items: center;
|
||||||
|
color: #291670;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0rem 0.5rem 0rem 0rem;
|
||||||
|
width: 6rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardDateDay{
|
||||||
|
font-size: 1.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardDateWeekday{
|
||||||
|
font-size: 1.15rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardDateMonth{
|
||||||
|
font-size: 1.15rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardWkData{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
flex-grow: 1;
|
||||||
|
background-color: #FF8100;
|
||||||
|
}
|
||||||
|
@media (min-width: 640px){
|
||||||
|
.wkInfoCardWkData{
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardWkInfo{
|
||||||
|
padding: 0 1rem;
|
||||||
|
flex-grow: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardButtonBar{
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardButton{
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: 2px;
|
||||||
|
color: #333;
|
||||||
|
font-size: .9rem;
|
||||||
|
margin: .5rem 0;
|
||||||
|
padding: .75rem 1rem;
|
||||||
|
text-align: center;
|
||||||
|
width: 7rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardButtonSuccess {
|
||||||
|
background-color: #291670;
|
||||||
|
color: #eee;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wkInfoCardButtonRaised {
|
||||||
|
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.16),
|
||||||
|
0 2px 10px 0 rgba(0, 0, 0, 0.12);
|
||||||
|
}
|
||||||
|
|
||||||
|
.fontWeightLighter {
|
||||||
|
font-weight: lighter;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.card__icon {
|
||||||
|
align-items: center;
|
||||||
|
color: #1ABC9C;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding: 1rem 2rem 1rem 0;
|
||||||
|
justify-content: center;
|
||||||
|
width: 6rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.event-icon {
|
||||||
|
font-size: 36px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.material-icons {
|
||||||
|
width: 1rem;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user