Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed the invalid css for jquery. Fixed bug JOINDIN-265.

Updated the user view to display the line correctly for events gone to and coming up
  • Loading branch information...
commit a67c94ba88645114efeb91dc2aa5c14ee1eb9b00 1 parent 9a11dbd
@jsundquist jsundquist authored lornajane committed
View
4 src/inc/css/jquery-ui/jquery-ui-1.7.3.custom.css
@@ -46,8 +46,8 @@
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Arial,Helvetica,\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'Liberation Sans\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\',FreeSans,sans-serif; font-size: 11px; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Arial,Helvetica,\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'Liberation Sans\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\',FreeSans,sans-serif; font-size: 1em; }
+.ui-widget { font-family: Arial,Helvetica,'Liberation Sans',FreeSans,sans-serif; font-size: 11px; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Arial,Helvetica,'Liberation Sans',FreeSans,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #d7dcdf; background: #ffffff url(images/ui-bg_flat_100_ffffff_40x100.png) 50% 50% repeat-x; color: #2368af; }
.ui-widget-content a { color: #2368af; }
.ui-widget-header { border: 1px solid #d7dcdf; background: #f0f4f8 url(images/ui-bg_inset-soft_0_f0f4f8_1x100.png) 50% 50% repeat-x; color: #2368af; font-weight: bold; }
View
2  src/inc/css/jquery-ui/theme/ui.all.css
@@ -57,7 +57,7 @@
/* Datepicker
----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display:none;}
.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
View
26 src/system/application/views/user/view.php
@@ -43,8 +43,8 @@
$talk_cdate = array();
$tmp_talk = array();
foreach ($talks as $k=>$v) {
- $talk_cdate[$v->ID] = $v->last_comment_date;
- $tmp_talk[$v->ID] = $v;
+ $talk_cdate[$v->ID] = $v->last_comment_date;
+ $tmp_talk[$v->ID] = $v;
}
arsort($talk_cdate);
// Resort our talks
@@ -53,11 +53,11 @@
$talks=$tmp;
$title = 'Talks (By Latest Comment)'; break;
case 'bycomment':
- $talk_ccount = array();
- $tmp_talk = array();
+ $talk_ccount = array();
+ $tmp_talk = array();
foreach ($talks as $k=>$v) {
$talk_ccount[$v->ID]= $v->ccount;
- $tmp_talk[$v->ID] = $v;
+ $tmp_talk[$v->ID] = $v;
}
arsort($talk_ccount);
foreach ($talk_ccount as $k=>$v) { $tmp[]=$tmp_talk[$k]; }
@@ -94,8 +94,8 @@
echo '<div style="padding-left:15px">';
foreach ($talks as $talk) {
$this->load->view('talk/_talk-row', array(
- 'talk' => $talk,
- 'override' => array($details[0]->ID=>$details[0]->full_name)
+ 'talk' => $talk,
+ 'override' => array($details[0]->ID=>$details[0]->full_name)
));
}
echo '</div>';
@@ -103,8 +103,8 @@
} else {
foreach ($talks as $talk) {
$this->load->view('talk/_talk-row', array(
- 'talk' => $talk,
- 'override' => array($details[0]->ID=>$details[0]->full_name)
+ 'talk' => $talk,
+ 'override' => array($details[0]->ID=>$details[0]->full_name)
));
}
}
@@ -141,9 +141,9 @@
//check the date and, if they have talks in their list, be sure that its in the list
foreach ($talks as $k=>$v) {
$d=array(
- 'event_name' => $v->event_name,
- 'event_start' => $v->date_given,
- 'ID' => $v->eid
+ 'event_name' => $v->event_name,
+ 'event_start' => $v->date_given,
+ 'ID' => $v->eid
);
$d=(object)$d;
if ($v->date_given<time()) {
@@ -168,7 +168,7 @@
<div class="row">
<strong><a href="/event/view/<?php echo $v->ID; ?>"><?php echo escape($v->event_name); ?></a></strong>
<?php echo date('M d, Y', $v->event_start); ?>
- <?php if (in_array($v->ID, $my)) { echo "<br/><span style=\"color:#92C53E;font-size:11px\">you'll be there!</span>"; } ?>
+ <?php if (in_array($v->ID, $my)) { echo "<br/><span style=\"color:#92C53E;\">you'll be there!</span>"; } ?>
<div class="clear"></div>
</div>
<?php } ?>
Please sign in to comment.
Something went wrong with that request. Please try again.