diff --git a/registration-system/index.php b/registration-system/index.php index 22792b9706b24b54ab0f739cbf0e44192e2dab79..b7bff081930567bab34ffdbd6740d951ae17813a 100644 --- a/registration-system/index.php +++ b/registration-system/index.php @@ -480,22 +480,47 @@ function index_show_fahrtHeader($fahrt){ "fahrt_id" => $fahrt['fahrt_id']]]); echo '<div class="fahrt"> + <div class="fahrt-left"> <a class="fahrthead" href="index.php?fid='.$fahrt['fahrt_id'].'">'.$fahrt['titel'].'</a>'; echo 'Ziel: <i>'.$fahrt['ziel'].'</i><br />'; echo 'Datum: <i>'.comm_from_mysqlDate($fahrt['von'])." - ".comm_from_mysqlDate($fahrt['bis']).'</i><br />'; echo "Ansprechpartner: <i>".$fahrt['leiter']." (".comm_convert_mail($fahrt['kontakt']).")</i><br />"; echo "Anmeldungen: <i>".$cnt." / ".$fahrt['max_bachelor']."</i>"; - echo '<p>'.$fahrt['beschreibung'].'</p> + echo '<p>'.$fahrt['beschreibung'].'</p></div> <div class="map-canvas" id="map-canvas-'.$fahrt['fahrt_id'].'"></div> + <div style="clear:both"></div> </div>'; + + } function index_show_fahrtHeader_js($fahrten){ global $index_db; + echo ' + <script type="text/javascript"> + //$(document).ready(function(){ + window.onload = function() { + $("div.fahrt-left i").click(function(){ + }); + + $("div.fahrt-left i").hover( + function(){ + $(this).html($(this).html().replace(/·/g, "🐭")); + $(this).html($(this).html().replace("Ø", "🐵")); + }, + function(){ + $(this).html($(this).html().replace(/ðŸ/g, "·")); + $(this).html($(this).html().replace("ðŸµ", "Ø")); + } + ); + }; + + </script>'; + $pins = $index_db->select("fahrten", ["fahrt_id", "map_pin"], ["fahrt_id" => $fahrten]); echo '<script src="https://maps.googleapis.com/maps/api/js?v=3.exp"></script> - <script>'; + <script type="text/javascript">'; foreach($pins as $p){ echo' @@ -535,7 +560,6 @@ function index_show_fahrtHeader_js($fahrten){ echo' } - google.maps.event.addDomListener(window, \'load\', initialize); </script>'; diff --git a/registration-system/view/graphics/selection.gif b/registration-system/view/graphics/selection.gif new file mode 100644 index 0000000000000000000000000000000000000000..e65ac83eeb3e6715d565dd351b948194e5431945 Binary files /dev/null and b/registration-system/view/graphics/selection.gif differ diff --git a/registration-system/view/style.css b/registration-system/view/style.css index 04951216272e0cd878dd0554e490edc284ab44d0..b6cf5bf3abd41a470287f0376e3c2a024dc8693e 100644 --- a/registration-system/view/style.css +++ b/registration-system/view/style.css @@ -276,7 +276,31 @@ p.edit_link { a.editenum { display: block; height: 20px; line-height: 20px; width: 20px; font-size: 0px; padding: 8px; background: url(edit.jpg) left center no-repeat; color: #FFF; } .fahrt{ - padding: 30px; + margin: 30px; + /*border: 1px dotted black;*/ + background-image: url("graphics/selection.gif"); + padding: 1px; +} +.fahrt-left{ + float: left; + width: 628px; + padding-left: 10px; + height: 300px; + overflow-y: auto; + overflow-x: hidden; + background-color: #f9f9f9; +} +.fahrt-left>p{ + margin-left: 5px !important; + padding-left: 10px; + border-left: 1px solid lightgray; +} +.fahrt-right, .map-canvas { + height: 300px; + width: 300px; + margin: 0px; + padding: 0px; + float: left; } .fahrttable { @@ -382,9 +406,3 @@ a.editenum { display: block; height: 20px; line-height: 20px; width: 20px; font- font-weight:bold; } -.map-canvas { - height: 300px; - width: 300px; - margin: 0px; - padding: 0px -} \ No newline at end of file