more fixes

includes/controller/users_controller.php

@@ -37,6 +37,7 @@ function user_controller() {
   
   $shifts = Shifts_by_user($user_source);
   foreach ($shifts as &$shift) {
+    // TODO: Move queries to model
     $shift['needed_angeltypes'] = sql_select("SELECT DISTINCT `AngelTypes`.* FROM `ShiftEntry` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . "  ORDER BY `AngelTypes`.`name`");
     foreach ($shift['needed_angeltypes'] as &$needed_angeltype) {
       $needed_angeltype['users'] = sql_select("

includes/pages/guest_login.php

@@ -293,9 +293,9 @@ function guest_login() {
           form_text('nick', _("Nick"), $nick),
           form_password('password', _("Password")),
           form_submit('submit', _("Login")),
-          form_info("", buttons(array(
+          buttons(array(
               button(page_link_to('user_password_recovery'), _("I forgot my password")) 
-          ))),
+          )),
           info(_("Please note: You have to activate cookies!"), true) 
       )),
       '</div>',

includes/sys_template.php

@@ -87,7 +87,7 @@ function toolbar_popover($glyphicon, $label, $content, $class = '') {
   return '<li class="dropdown messages ' . $class . '">
           <a id="' . $id . '" href="#" tabindex="0">' . ($glyphicon != '' ? '<span class="glyphicon glyphicon-' . $glyphicon . '"></span> ' : '') . $label . ' <span class="caret"></span></a>
           <script type="text/javascript">
-          $(document).ready(function(){$("#' . $id . '").popover({trigger: "focus", html: true, content: "' . addslashes(join('', $content)) . '", placement: "bottom", container: "body"})});
+          $(document).ready(function(){$("#' . $id . '").popover({trigger: "click focus", html: true, content: "' . addslashes(join('', $content)) . '", placement: "bottom", container: "#navbar-collapse-1"})});
           </script></li>';
 }
 

includes/view/User_view.php

@@ -99,6 +99,8 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
   $timesum = 0;
   foreach ($shifts as $shift) {
     $shift_info = '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>';
+    if ($shift['title'])
+      $shift_info .= '<br /><a href="' . shift_link($shift) . '">' . $shift['title'] . '</a>';
     foreach ($shift['needed_angeltypes'] as $needed_angel_type) {
       $shift_info .= '<br><b>' . $needed_angel_type['name'] . ':</b> ';