I must have changed something because there are uncomitted changes

This commit is contained in:
philgran
2011-04-20 17:10:49 -04:00
parent ded03644c3
commit a9bcbcfec1
3 changed files with 27 additions and 87 deletions
+7 -8
View File
@@ -63,12 +63,12 @@ table tbody tr.open td.name {
table tbody tr.open td.expanded-detail-cell {
border-top: 0 none;
}
table tbody tr:hover {
cursor: pointer;
}
table tbody tr td.name > div {
position: relative;
}
table tbody tr:hover td.name {
cursor: pointer;
}
table tbody tr td.name .expandable {
color: #aaa;
display: none;
@@ -100,7 +100,7 @@ table tbody tr td.name {
background: #fff;
}
table tbody tr:nth-child(odd) td.name {
background: #f6f6f6;
background: #eee;
}
div#campaigns table tbody tr td.name {
background: transparent;
@@ -309,8 +309,8 @@ div#li-detail .chart {
height: 180px;
}
div#li-detail div#campaigns .chart {
width: 250px;
height: 250px;
width: auto;
height: auto;
}
@@ -338,7 +338,6 @@ div#li-detail h2 {
div#li-detail div.expanded-detail {
margin-bottom: 1em;
overflow: hidden;
width: 100%;
}
div#campaigns {
padding-top: 10px;
@@ -366,7 +365,7 @@ ul.li-thumbs li {
padding: 0;
}
ul.li-thumbs li {
background: #f6f6f6;
background: #eee;
border: 1px solid #ddd;
border-right: 3px solid #aaa;
cursor: pointer;
+16 -70
View File
@@ -30,11 +30,6 @@
<li>All Saints (22756)</li>
<li>MattressLand (21194)</li>
<li>AT&amp;T (22754)</li>
<li>Essilor (21196)</li>
<li>All Saints (22756)</li>
<li>MattressLand (21194)</li>
<li>AT&amp;T (22754)</li>
<li>MattressLand (21194)</li>
</ul>
</div>
@@ -71,7 +66,7 @@
</div>
</div>
<div class="actions">
<h3>Alerts and Suggestions</h3>
<h3>Alerts</h3>
<ul>
<li class="alert"><a href="#" title="Show me this creative">1 creative has status <b>unauditable</b></a></li>
<li class="alert"><a href="#" title="Show me this campaign">1 campaign is <b>underdelivering</b></a></li>
@@ -96,7 +91,10 @@
<tbody>
<tr>
<td class="name">
<h4>Norwest Flight 1 - personifi (58591)</h4>
<div>
<div class="expandable">&#x25BE;<!-- &#x25BC; --></div>
<h4>Norwest Flight 1 - personifi (58591)</h4>
</div>
</td>
<td>
<h3>6,765,720</h3>
@@ -142,8 +140,8 @@
<tr class="summary" style="display:none;">
<td class="expanded-detail-cell" colspan="8">
<div class="expanded-detail clearfix">
<h2><a href="#" title="View campaign details">Norwest Flight 1 Personifi (58951)</a></h2>
<div class="stats">
<h2><a href="#" title="View campaign details">Norwest Flight 1 Personifi (58951)</a></h2>
<dl>
<dt>State:</dt>
<dd>Active</dd>
@@ -171,7 +169,7 @@
</div>
</div>
<div class="actions">
<h3>Alerts and Suggestions</h3>
<h3>Alerts</h3>
<ul>
<li class="alert"><a href="#" title="Show me this creative">1 creative has status <b>unauditable</b></a></li>
</ul>
@@ -181,7 +179,10 @@
</tr>
<tr>
<td class="name">
<h4>Norwest Flight 1 Behavior (58643)</h4>
<div>
<div class="expandable">&#x25BE;<!-- &#x25BC; --></div>
<h4>Norwest Flight 1 Behavior (58643)</h4>
</div>
</td>
<td>
<h3>2,323,187</h3>
@@ -227,8 +228,8 @@
<tr class="summary" style="display:none;">
<td class="expanded-detail-cell" colspan="8">
<div class="expanded-detail clearfix">
<h2><a href="#" title="View campaign details">Norwest Flight 1 Behavior (58643)</a></h2>
<div class="stats">
<h2><a href="#" title="View campaign details">Norwest Flight 1 Behavior (58643)</a></h2>
<dl>
<dt>State:</dt>
<dd>Active</dd>
@@ -256,7 +257,7 @@
</div>
</div>
<div class="actions">
<h3>Alerts and Suggestions</h3>
<h3>Alerts</h3>
<ul>
<li class="alert"><a href="#" title="Show me this creative">1 creative has status <b>unauditable</b></a></li>
</ul>
@@ -287,65 +288,10 @@
$(function(){
$('table tr').not('.summary').bind('click', function(){
$(this).toggleClass('open').next('tr.summary').toggleClass('open').toggle();
$('table tr td.name').not('.summary').bind('click', function(){
$(this).closest('tr').toggleClass('open').next('tr.summary').toggleClass('open').toggle();
});
pacing = new Highcharts.Chart({
chart: {
backgroundColor: 'transparent',
renderTo: 'pacing',
spacingTop: 5,
spacingBottom: 5,
spacingRight: 5,
spacingLeft: 0,
type: 'line'
},
credits: disabled,
legend: disabled,
plotOptions: {
series: {
marker: disabled,
pointStart: Date.UTC(2010, 2, 17),
pointInterval: 24 * 3600 * 1000 // one day
}
},
title: noText,
xAxis: {
labels: {
formatter: function() {
return Highcharts.dateFormat('%d-%b', this.value);
},
style: std
},
tickPixelInterval: 70,
type: 'datetime'
},
yAxis: {
labels: {
formatter: function() {
return this.value;
},
style: std,
y: 4
},
gridLineWidth: 0,
lineWidth: 1,
maxPadding: 0.01,
min: 0,
tickPixelInterval: 20,
tickWidth: 1,
title: noText
},
series: [{
name: 'Budgeted Imps',
data: [397810, 795620, 1193430, 1591240, 1989050, 2386860, 2784670, 3182480, 3580290, 3978100, 4375910, 4773720, 5171530, 5569340, 5967150, 6364960, 6762770, 7160580, 7558390, 7956200, 8354010, 8751820, 9149630, 9547440, 9945250, 10343060, 10740870, 11138680, 11536490, 11934300, 12332110, 12729920, 13127730, 13525540, 13923350]
}, {
name: 'Actual Imps',
data: [324408, 1014531, 2155429, 2519643, 2606619, 2688038, 2800402, 3078928, 3209188, 3539023, 3892435, 4142545, 4494033, 4494033, 4773720, 5171530, 5269340, 5567150, 5964960, 6262770, 6660580, 7158390, 7456200, 7954010, 8101365, 8101365, 8101365]
}]
});
campaign1Pacing = new Highcharts.Chart({
chart: {
backgroundColor: 'transparent',
+4 -9
View File
@@ -85,8 +85,8 @@
<tr class="summary" style="display:none;">
<td class="expanded-detail-cell" colspan="10">
<div class="expanded-detail clearfix">
<h2>Norwest Bank — March (26586)</h2>
<div class="stats">
<h2>Norwest Bank — March (26586)</h2>
<dl>
<dt>State:</dt>
<dd>Active</dd>
@@ -116,7 +116,7 @@
</div>
</div>
<div class="actions">
<h3>Alerts and Suggestions</h3>
<h3>Alerts</h3>
<ul>
<li class="alert">1 creative has status <b>unauditable</b> &mdash; <a href="#">View creative</a></li>
<li class="alert">1 campaign is <b>underdelivering</b> &mdash; <a href="#">View campaign</a></li>
@@ -408,13 +408,8 @@
$(function(){
$('table tr').not('.summary').bind('click', function(e){
var el = e.target.nodeName.toLowerCase();
if (el !== 'a' && el !== 'img') {
$(this).toggleClass('open').next('tr.summary').toggleClass('open').toggle();
} else {
e.stopPropagation();
}
$('table tr td.name').not('.summary').bind('click', function(e){
$(this).closest('tr').toggleClass('open').next('tr.summary').toggleClass('open').toggle();
});
// $('div.progress [data-num-imps]').hover(