Navigation

← Previous Change
Next Change →

htdocs

Timestamp:

10/09/08 01:36:50 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1223516210 +0000

git-parent:

[848c999201996fa821ee897f8bc9e3c0979a575f]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1223516210 +0000

Message:

fix the id collisions... at least the ones bothering me. Get the counter-dev working, but break the normal derivatives, refs #22

Files:

ui/web/htdocs/css/datepicker.css (modified) (2 diffs)
ui/web/htdocs/css/style.css (modified) (4 diffs)
ui/web/htdocs/graph_panel.inc (modified) (8 diffs)
ui/web/htdocs/json_graph_flot.php (modified) (1 diff)
ui/web/htdocs/worksheet_panel.inc (modified) (7 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

ui/web/htdocs/css/datepicker.css

r646f051	r47a8b0a
191	191	}
192	192
193		#widgetCalendar {
	193	.widgetCalendar {
194	194	height: 0;
195	195	position: relative;
…	…
199	199	background: #B9B9B9;
200	200	}
201		#widgetCalendar .datepicker {
	201	.widgetCalendar .datepicker {
202	202	position: absolute;
203	203	bottom: 0;
204	204	top: auto;
205	205	}
206		#widgetCalendar .datepickerContainer,
207		#widgetCalendar .datepickerBorderT,
208		#widgetCalendar .datepickerBorderB,
209		#widgetCalendar .datepickerBorderL,
210		#widgetCalendar .datepickerBorderR,
211		#widgetCalendar .datepickerBorderTL,
212		#widgetCalendar .datepickerBorderTR,
213		#widgetCalendar .datepickerBorderBL,
214		#widgetCalendar .datepickerBorderBR {
	206	.widgetCalendar .datepickerContainer,
	207	.widgetCalendar .datepickerBorderT,
	208	.widgetCalendar .datepickerBorderB,
	209	.widgetCalendar .datepickerBorderL,
	210	.widgetCalendar .datepickerBorderR,
	211	.widgetCalendar .datepickerBorderTL,
	212	.widgetCalendar .datepickerBorderTR,
	213	.widgetCalendar .datepickerBorderBL,
	214	.widgetCalendar .datepickerBorderBR {
215	215	background: transparent !important;
216	216	}
217		#widgetCalendar .datepicker a:hover{
	217	.widgetCalendar .datepicker a:hover{
218	218	color: #b6f063;
219	219	}

ui/web/htdocs/css/style.css

rfb2f0f7	r47a8b0a
248	248	#graphlist ul li ul li a em{color:#82787b;padding-left:3px;}
249	249
250		div.plot-area { height: ~~180px; width:~~ 380px; }
	250	div.plot-area { height:180px;width:380px; }
251	251	div.plot-area div.centered{
252		height: ~~180px; width:~~ 380px;
253		display: table-cell;vertical-align:middle;text-align:center;
	252	height:180px;width:380px;
	253	display:table-cell;vertical-align:middle;text-align:center;
254	254	}
255	255	div.plot-area div.centered .loading {
256	256	background:url(../images/jquery-ajax-loader.gif) top center no-repeat;
257	257	height:25px;width:380px;
	258	}
	259
	260	#maingraph div.plot-area { height:400px;width:780px; }
	261	#maingraph div.plot-area div.centered{
	262	height:400;width:780px;
	263	display:table-cell;vertical-align:middle;text-align:center;
	264	}
	265	#maingraph div.plot-area div.centered .loading {
	266	background:url(../images/jquery-ajax-loader.gif) top center no-repeat;
	267	height:25px;width:780px;
258	268	}
259	269
…	…
325	335
326	336	/***** date zoom and range *****/
327		#~~datetool{/background:yellow;/~~margin:18px 0;overflow:auto;clear:both;}
328
329		#zoom {overflow:hidden;float:left;z-index:2900;}
330		#zoom dl {list-style:none;}
331		#zoom dl dt {padding-right:5px;font-size:10px;text-transform:uppercase;}
332		~~#zoom dl dt, #~~zoom dl dd {display:inline;float:left;}
333		#zoom dl dd a {
	337	#ws_datetool, #graph_datetool{margin:18px 0;overflow:auto;clear:both;}
	338
	339	.zoom {overflow:hidden;float:left;z-index:2900;}
	340	.zoom dl {list-style:none;}
	341	.zoom dl dt {padding-right:5px;font-size:10px;text-transform:uppercase;}
	342	.zoom dl dt, .zoom dl dd {display:inline;float:left;}
	343	.zoom dl dd a {
334	344	padding:0px;
335	345	color:#82787b;
…	…
342	352	text-align:center;
343	353	}
344		#zoom dl dd a.first {
	354	.zoom dl dd a.first {
345	355	border:1px solid #cdd4e0;
346	356	}
347		#zoom dl dd a:hover{background:#ebeef2;}
348		#zoom dl dd a.selected{background:url(../images/bg-tab-zoom-arrow.png) top left no-repeat;padding-bottom:7px;border:none;border-top:1px solid #cdd4e0;}
349		#zoom dl dd a:hover.selected{background:url(../images/bg-tab-zoom-arrow.png) top left no-repeat;}
350
351		#range {overflow:hidden;float:left;margin-left:2em;}
352		#range dl {list-style:none;}
353		#range dl dt {padding-right:5px;font-size:10px;text-transform:uppercase;}
354		~~#range dl dt, #~~range dl dd {display:inline;float:left;}
355		#range dl dd a {
	357	.zoom dl dd a:hover{background:#ebeef2;}
	358	.zoom dl dd a.selected{background:url(../images/bg-tab-zoom-arrow.png) top left no-repeat;padding-bottom:7px;border:none;border-top:1px solid #cdd4e0;}
	359	.zoom dl dd a:hover.selected{background:url(../images/bg-tab-zoom-arrow.png) top left no-repeat;}
	360
	361	.range {overflow:hidden;float:left;margin-left:2em;}
	362	.range dl {list-style:none;}
	363	.range dl dt {padding-right:5px;font-size:10px;text-transform:uppercase;}
	364	.range dl dt, .range dl dd {display:inline;float:left;}
	365	.range dl dd a {
356	366	padding:0px;
357	367	color:#82787b;
…	…
364	374	background:url(../images/bg-arrow-range.png) top right no-repeat;
365	375	}
366		~~#range dl dd a:hover, #~~range dl dd a:focus{/background:url(../images/bg-arrow-range.png) 15px right no-repeat;/border:1px solid #9baac1;}
	376	.range dl dd a:hover, .range dl dd a:focus{/background:url(../images/bg-arrow-range.png) 15px right no-repeat;/border:1px solid #9baac1;}
367	377
368	378	#panel {

ui/web/htdocs/graph_panel.inc

r1a8ddc4	r47a8b0a
33	33	$(domid).slideDown("normal");
34	34	var url = "flot/graph/settings/" + graphinfo.id;
	35	$(domid + " .plot-area").html('<div class="centered"><div class="loading"> </div></div>');
35	36	$.getJSON(url, {'cnt':displayinfo.cnt, 'start':displayinfo.start, 'end':displayinfo.end}, function (r) { plot_id(r,domid); });
36	37	}
…	…
179	180	};
180	181	var state = false;
181		$(".btn-slide").click(function(){
182		$("#widgetCalendar").stop().animate({
	182	$("#graph_datetool .btn-slide").click(function(){
	183	$("#graph_widgetCalendar").stop().animate({
183	184	height: state ? 0 :
184		$('#widgetCalendar div.datepicker').get(0).offsetHeight
	185	$('#graph_widgetCalendar div.datepicker').get(0).offsetHeight
185	186	}, 500);
186	187	state = !state;
…	…
188	189	return false;
189	190	});
190		$(".datechoice").click(function(){
191		$("#range a.btn-slide").html("YYYY/MM/DD - YYYY/MM/DD");
192		$("#widgetCalendar").slideUp("slow");
193		$(".datechoice").removeClass("selected");
	191	$("#graph_datetool .datechoice").click(function(){
	192	$("#graph_datetool .range a.btn-slide").html("YYYY/MM/DD - YYYY/MM/DD");
	193	$("#graph_widgetCalendar").slideUp("slow");
	194	$("#graph_datetool .datechoice").removeClass("selected");
194	195	displayinfo.start = time_windows[$(this).html()];
195	196	displayinfo.end = '';
…	…
198	199	return false;
199	200	});
200		$('#widgetCalendar').DatePicker({
	201	$('#graph_widgetCalendar').DatePicker({
201	202	flat: true,
202	203	format: 'Y/m/d',
…	…
214	215	displayinfo.end = end.toUTCString();
215	216	redraw_current_graph("#maingraph");
216		$('#range a.btn-slide').get(0).innerHTML = formated.join(' - ');
	217	$('#graph_datetool .range a.btn-slide').get(0).innerHTML = formated.join(' - ');
217	218	}
218	219	});
…	…
228	229	</script>
229	230
230		<div id="datetool">
231		<div id="zoom">
	231	<div id="graph_datetool">
	232	<div class="zoom">
232	233	<dl>
233	234	<dt>Zoom:</dt>
…	…
239	240	</dl>
240	241	</div>
241		<div id="range">
	242	<div class="range">
242	243	<dl>
243	244	<dt>Date Range:</dt>
…	…
246	247	</div>
247	248	<br/>
248		<div id="widgetCalendar"></div>
	249	<div id="graph_widgetCalendar" class="widgetCalendar"></div>
249	250	</div>
250	251

ui/web/htdocs/json_graph_flot.php

rfb2f0f7	r47a8b0a
28	28	if($d['metric_type'] == 'numeric') {
29	29	$driver->addDataSet($d['sid'], $d['metric_name'],
30		($d['derive']=="true")?"~~true~~":"false",
	30	($d['derive']=="true")?"counter":"false",
31	31	$d['math2'], $settings);
32	32	}

ui/web/htdocs/worksheet_panel.inc

r1a8ddc4	r47a8b0a
71	71	};
72	72	var state = false;
73		$(".btn-slide").click(function(){
74		$("#widgetCalendar").stop().animate({
	73	$("#ws_datetool .btn-slide").click(function(){
	74	$("#ws_widgetCalendar").stop().animate({
75	75	height: state ? 0 :
76		$('#widgetCalendar div.datepicker').get(0).offsetHeight
	76	$('#ws_widgetCalendar div.datepicker').get(0).offsetHeight
77	77	}, 500);
78	78	state = !state;
…	…
80	80	return false;
81	81	});
82		$(".datechoice").click(function(){
83		$("#range a.btn-slide").html("YYYY/MM/DD - YYYY/MM/DD");
84		$("#widgetCalendar").slideUp("slow");
	82	$("#ws_datetool .datechoice").click(function(){
	83	$("#ws_datetool .range a.btn-slide").html("YYYY/MM/DD - YYYY/MM/DD");
	84	$("#ws_widgetCalendar").slideUp("slow");
85	85	$(".datechoice").removeClass("selected");
86	86	ws_displayinfo.start = time_windows[$(this).html()];
…	…
90	90	return false;
91	91	});
92		$('#widgetCalendar').DatePicker({
	92	$('#ws_widgetCalendar').DatePicker({
93	93	flat: true,
94	94	format: 'Y/m/d',
…	…
107	107	load_worksheet('');
108	108	$(".datechoice").removeClass("selected");
109		$('#range a.btn-slide').get(0).innerHTML = formated.join(' - ');
	109	$('#ws_datetool .range a.btn-slide').get(0).innerHTML = formated.join(' - ');
110	110	}
111	111	});
…	…
117	117	</script>
118	118
119		<div id="datetool">
120		<div id="zoom">
	119	<div id="ws_datetool">
	120	<div class="zoom">
121	121	<dl>
122	122	<dt>Zoom:</dt>
…	…
128	128	</dl>
129	129	</div>
130		<div id="range">
	130	<div class="range">
131	131	<dl>
132	132	<dt>Date Range:</dt>
…	…
135	135	</div>
136	136	<br style="clear:both; margin-bottom:0.5em;"/>
137		<div id="widgetCalendar"></div>
	137	<div id="ws_widgetCalendar" class="widgetCalendar"></div>
138	138	</div>
139	139