use the new very cool glyph button

includes/pages/user_news.php

@@ -13,18 +13,18 @@ function meetings_title() {
 
 function user_meetings() {
   global $DISPLAY_NEWS, $privileges, $user;
-  
+
   $html = '<div class="col-md-12"><h1>' . meetings_title() . '</h1>' . msg();
-  
+
   if (isset($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page']))
     $page = $_REQUEST['page'];
   else
     $page = 0;
-  
+
   $news = sql_select("SELECT * FROM `News` WHERE `Treffen`=1 ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS));
   foreach ($news as $entry)
     $html .= display_news($entry);
-  
+
   $dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $DISPLAY_NEWS);
   $html .= '<div class="text-center">' . '<ul class="pagination">';
   for ($i = 0; $i < $dis_rows; $i ++) {
@@ -37,30 +37,30 @@ function user_meetings() {
     $html .= '<a href="' . page_link_to("user_meetings") . '&page=' . $i . '">' . ($i + 1) . '</a></li>';
   }
   $html .= '</ul></div></div>';
-  
+
   return $html;
 }
 
 function display_news($news) {
   global $privileges, $p;
-  
+
   $html = '';
   $html .= '<div class="panel' . ($news['Treffen'] == 1 ? ' panel-info' : ' panel-default') . '">';
   $html .= '<div class="panel-heading">';
   $html .= '<h3 class="panel-title">' . ($news['Treffen'] == 1 ? '[Meeting] ' : '') . ReplaceSmilies($news['Betreff']) . '</h3>';
   $html .= '</div>';
   $html .= '<div class="panel-body">' . ReplaceSmilies(nl2br($news['Text'])) . '</div>';
-  
+
   $html .= '<div class="panel-footer text-muted">';
   if (in_array("admin_news", $privileges))
-    $html .= '<div class="pull-right"><a class="btn btn-xs btn-default" href="' . page_link_to("admin_news") . '&action=edit&id=' . $news['ID'] . '">' . _("edit") . '</a></div>';
+    $html .= '<div class="pull-right">' . button_glyph(page_link_to("admin_news") . '&action=edit&id=' . $news['ID'], 'edit', 'btn-sm') . '</div>';
-  
+
   $html .= '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $news['Datum']) . '&emsp;';
-  
+
   $user_source = User($news['UID']);
   if ($user_source === false)
     engelsystem_error(_("Unable to load user."));
-  
+
   $html .= User_Nick_render($user_source);
   if ($p != "news_comments")
     $html .= '&emsp;<a href="' . page_link_to("news_comments") . '&nid=' . $news['ID'] . '"><span class="glyphicon glyphicon-comment"></span> ' . _("Comments") . ' &raquo;</a> <span class="badge">' . sql_num_query("SELECT * FROM `NewsComments` WHERE `Refid`='" . sql_escape($news['ID']) . "'") . '</span>';
@@ -71,7 +71,7 @@ function display_news($news) {
 
 function user_news_comments() {
   global $user;
-  
+
   $html = '<div class="col-md-12"><h1>' . user_news_comments_title() . '</h1>';
   if (isset($_REQUEST["nid"]) && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid']) && sql_num_query("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1") > 0) {
     $nid = $_REQUEST["nid"];
@@ -82,15 +82,15 @@ function user_news_comments() {
       engelsystem_log("Created news_comment: " . $text);
       $html .= success(_("Entry saved."), true);
     }
-    
+
     $html .= display_news($news);
-    
+
     $comments = sql_select("SELECT * FROM `NewsComments` WHERE `Refid`='" . sql_escape($nid) . "' ORDER BY 'ID'");
     foreach ($comments as $comment) {
       $user_source = User($comment['UID']);
       if ($user_source === false)
         engelsystem_error(_("Unable to load user."));
-      
+
       $html .= '<div class="panel panel-default">';
       $html .= '<div class="panel-body">' . nl2br($comment['Text']) . '</div>';
       $html .= '<div class="panel-footer text-muted">';
@@ -99,25 +99,25 @@ function user_news_comments() {
       $html .= '</div>';
       $html .= '</div>';
     }
-    
+
     $html .= '<hr /><h2>' . _("New Comment:") . '</h2>';
     $html .= form(array(
         form_textarea('text', _("Message"), ''),
-        form_submit('submit', _("Save")) 
+        form_submit('submit', _("Save"))
     ), page_link_to('news_comments') . '&nid=' . $news['ID']);
-  
+
   } else {
     $html .= _("Invalid request.");
   }
-  
+
   return $html . '</div>';
 }
 
 function user_news() {
   global $DISPLAY_NEWS, $privileges, $user;
-  
+
   $html = '<div class="col-md-12"><h1>' . news_title() . '</h1>' . msg();
-  
+
   if (isset($_POST["text"]) && isset($_POST["betreff"]) && in_array("admin_news", $privileges)) {
     if (! isset($_POST["treffen"]) || ! in_array("admin_news", $privileges))
       $_POST["treffen"] = 0;
@@ -126,16 +126,16 @@ function user_news() {
     success(_("Entry saved."));
     redirect(page_link_to('news'));
   }
-  
+
   if (isset($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page']))
     $page = $_REQUEST['page'];
   else
     $page = 0;
-  
+
   $news = sql_select("SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS));
   foreach ($news as $entry)
     $html .= display_news($entry);
-  
+
   $dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $DISPLAY_NEWS);
   $html .= '<div class="text-center">' . '<ul class="pagination">';
   for ($i = 0; $i < $dis_rows; $i ++) {
@@ -148,18 +148,18 @@ function user_news() {
     $html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i + 1) . '</a></li>';
   }
   $html .= '</ul></div>';
-  
+
   if (in_array("admin_news", $privileges)) {
     $html .= '<hr />';
     $html .= '<h2>' . _("Create news:") . '</h2>';
-    
+
     $html .= form(array(
         form_text('betreff', _("Subject"), ''),
         form_textarea('text', _("Message"), ''),
         form_checkbox('treffen', _("Meeting"), false, 1),
-        form_submit('submit', _("Save")) 
+        form_submit('submit', _("Save"))
     ));
   }
   return $html . '</div>';
 }
-?>
+?>

includes/view/User_view.php

@@ -16,7 +16,7 @@ $tshirt_sizes = array(
     'S-G' => "S Girl",
     'M-G' => "M Girl",
     'L-G' => "L Girl",
-    'XL-G' => "XL Girl" 
+    'XL-G' => "XL Girl"
 );
 
 function Users_view($users, $order_by, $arrived_count, $active_count, $force_active_count, $freeloads_count, $tshirts_count) {
@@ -28,7 +28,7 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act
     $user['Tshirt'] = glyph_bool($user['Tshirt']);
     $user['lastLogIn'] = date(_('m/d/Y h:i a'), $user['lastLogIn']);
     $user['actions'] = table_buttons(array(
-        button(page_link_to('admin_user') . '&id=' . $user['UID'], _('edit'), 'btn-xs') 
+        button_glyph(page_link_to('admin_user') . '&id=' . $user['UID'], 'edit', 'btn-sm') 
     ));
   }
   $users[] = array(
@@ -38,13 +38,13 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act
       'force_active' => $force_active_count,
       'freeloads' => $freeloads_count,
       'Tshirt' => $tshirts_count,
-      'actions' => '<strong>' . count($users) . '</strong>' 
+      'actions' => '<strong>' . count($users) . '</strong>'
   );
-  
+
   return page_with_title(_('All users'), array(
       msg(),
       buttons(array(
-          button(page_link_to('register'), glyph('plus') . _('New user')) 
+          button(page_link_to('register'), glyph('plus') . _('New user'))
       )),
       table(array(
           'Nick' => Users_table_header_link('Nick', _('Nick'), $order_by),
@@ -58,8 +58,8 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act
           'Tshirt' => Users_table_header_link('Tshirt', _('T-Shirt'), $order_by),
           'Size' => Users_table_header_link('Size', _('Size'), $order_by),
           'lastLogIn' => Users_table_header_link('lastLogIn', _('Last login'), $order_by),
-          'actions' => '' 
+          'actions' => ''
-      ), $users) 
+      ), $users)
   ));
 }
 
@@ -71,18 +71,18 @@ function User_shift_state_render($user) {
   $upcoming_shifts = ShiftEntries_upcoming_for_user($user);
   if ($upcoming_shifts === false)
     return false;
-  
+
   if (count($upcoming_shifts) == 0)
     return '<span class="text-success">' . _("Free") . '</span>';
-  
+
   if ($upcoming_shifts[0]['start'] > time())
     if ($upcoming_shifts[0]['start'] - time() > 3600)
       return '<span class="text-success moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>';
     else
       return '<span class="text-warning moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>';
-  
+
   $halfway = ($upcoming_shifts[0]['start'] + $upcoming_shifts[0]['end']) / 2;
-  
+
   if (time() < $halfway)
     return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Shift starts %c") . '</span>';
   else
@@ -91,9 +91,9 @@ function User_shift_state_render($user) {
 
 function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) {
   global $LETZTES_AUSTRAGEN, $privileges;
-  
+
   $user_name = htmlspecialchars($user_source['Vorname']) . " " . htmlspecialchars($user_source['Name']);
-  
+
   $myshifts_table = array();
   $html = "";
   $timesum = 0;
@@ -101,7 +101,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
     $shift_info = $shift['name'];
     foreach ($shift['needed_angeltypes'] as $needed_angel_type) {
       $shift_info .= '<br><b>' . $needed_angel_type['name'] . ':</b> ';
-      
+
       $shift_entries = array();
       foreach ($needed_angel_type['users'] as $user_shift) {
         if ($its_me)
@@ -110,34 +110,34 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
           $member = User_Nick_render($user_shift);
         if ($user_shift['freeloaded'])
           $member = '<strike>' . $member . '</strike>';
-        
+
         $shift_entries[] = $member;
       }
       $shift_info .= join(", ", $shift_entries);
     }
-    
+
     $myshift = array(
         'date' => date("Y-m-d", $shift['start']),
         'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']),
         'room' => $shift['Name'],
         'shift_info' => $shift_info,
-        'comment' => $shift['Comment'] 
+        'comment' => $shift['Comment']
     );
-    
+
     if ($shift['freeloaded']) {
       if (in_array("user_shifts_admin", $privileges))
         $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . ': ' . $shift['freeload_comment'] . '</p>';
       else
         $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . '</p>';
     }
-    
+
     $myshift['actions'] = array();
     if ($its_me || in_array('user_shifts_admin', $privileges))
       $myshift['actions'][] = button(page_link_to('user_myshifts') . '&edit=' . $shift['id'] . '&id=' . $user_source['UID'], glyph('edit') . _('edit'), 'btn-xs');
     if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges))
       $myshift['actions'][] = button(page_link_to('user_myshifts') . ((! $its_me) ? '&id=' . $user_source['UID'] : '') . '&cancel=' . $shift['id'], glyph('trash') . _('sign off'), 'btn-xs');
     $myshift['actions'] = table_buttons($myshift['actions']);
-    
+
     if ($shift['freeloaded'])
       $timesum += - 2 * ($shift['end'] - $shift['start']);
     else
@@ -151,9 +151,9 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
         'room' => "",
         'shift_info' => "",
         'comment' => "",
-        'actions' => "" 
+        'actions' => ""
     );
-  
+
   return page_with_title('<span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . ' <small>' . $user_name . '</small>', array(
       msg(),
       div('row', array(
@@ -161,7 +161,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
               '<h1>',
               '<span class="glyphicon glyphicon-phone"></span>',
               $user_source['DECT'],
-              '</h1>' 
+              '</h1>'
           )),
           div('col-md-3', array(
               '<h4>' . _("User state") . '</h4>',
@@ -169,23 +169,23 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
               $user_source['Gekommen'] ? User_shift_state_render($user_source) . '<br />' : '',
               ($user_source['Gekommen'] ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' . _("Arrived") . '</span>' : '<span class="text-danger">' . _("Not arrived") . '</span>'),
               ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Aktiv']) ? ' <span class="text-success">' . _("Active") . '</span>' : '',
-              ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Tshirt']) ? ' <span class="text-success">' . _("T-Shirt") . '</span>' : '' 
+              ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Tshirt']) ? ' <span class="text-success">' . _("T-Shirt") . '</span>' : ''
           )),
           div('col-md-3', array(
               '<h4>' . _("Angeltypes") . '</h4>',
-              User_angeltypes_render($user_angeltypes) 
+              User_angeltypes_render($user_angeltypes)
           )),
           div('col-md-3', array(
               '<h4>' . _("Rights") . '</h4>',
-              User_groups_render($user_groups) 
+              User_groups_render($user_groups)
-          )) 
+          ))
       )),
       buttons(array(
           $admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], '<span class="glyphicon glyphicon-edit"></span> ' . _("edit")) : '',
           ! $user_source['Gekommen'] ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '',
           $its_me ? button(page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], glyph('calendar') . _("iCal Export")) : '',
           $its_me ? button(page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], glyph('export') . _("JSON Export")) : '',
-          $its_me ? button(page_link_to_absolute('user_myshifts') . '&reset', glyph('repeat') . _('Reset API key')) : '' 
+          $its_me ? button(page_link_to_absolute('user_myshifts') . '&reset', glyph('repeat') . _('Reset API key')) : ''
       )),
       ($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '',
       ($its_me || $admin_user_privilege) ? table(array(
@@ -194,9 +194,9 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
           'room' => _("Location"),
           'shift_info' => _("Name &amp; workmates"),
           'comment' => _("Comment"),
-          'actions' => _("Action") 
+          'actions' => _("Action")
       ), $myshifts_table) : '',
-      $its_me && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '' 
+      $its_me && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : ''
   ));
 }
 
@@ -209,8 +209,8 @@ function User_password_recovery_view() {
       _("We will send you an e-mail with a password recovery link. Please use the email address you used for registration."),
       form(array(
           form_text('email', _("E-Mail"), ""),
-          form_submit('submit', _("Recover")) 
+          form_submit('submit', _("Recover"))
-      )) 
+      ))
   ));
 }
 
@@ -224,8 +224,8 @@ function User_password_set_view() {
       form(array(
           form_password('password', _("Password")),
           form_password('password2', _("Confirm password")),
-          form_submit('submit', _("Save")) 
+          form_submit('submit', _("Save"))
-      )) 
+      ))
   ));
 }
 
@@ -256,7 +256,7 @@ function User_groups_render($user_groups) {
 /**
  * Render a users avatar.
  *
- * @param User $user          
+ * @param User $user
  * @return string
  */
 function User_Avatar_render($user) {
@@ -266,7 +266,7 @@ function User_Avatar_render($user) {
 /**
  * Render a user nickname.
  *
- * @param User $user_source          
+ * @param User $user_source
  * @return string
  */
 function User_Nick_render($user_source) {