Project

General

Profile

« Previous | Next » 

Revision 7abf7db5

Added by Scott Dale about 17 years ago

correctly load container for widgets not in saved config, also make AJAX function names more clear

View differences:

usr/local/www/index.php
156 156
	$config['widgets'] = array();
157 157
}
158 158

  
159
##build widget information
159
##build widget saved list information
160 160
if ($config['widgets'] && $config['widgets']['sequence'] != "") {
161 161
	$pconfig['sequence'] = $config['widgets']['sequence'];
162 162
	
......
177 177
		$savedwidgetfiles[] = $widgetname . ".widget.php";
178 178
	}
179 179
	
180
	##add widgets that may not be in the saved configuration, in case they are to be displayed later
181
    foreach ($widgetfiles as $defaultwidgets){         
182
         if (!in_array($defaultwidgets, $savedwidgetfiles)){
183
             $savedwidgetfiles[] = $defaultwidgets;
184
         }
185
     }   
186
	
180 187
	##find custom configurations of a particular widget and load its info to $pconfig
181 188
	foreach ($widgetnames as $widget){
182 189
        if ($config['widgets'][$widget . '-config']){
......
185 192
    }   
186 193
	
187 194
	$widgetlist = $savedwidgetfiles;	
188
} else{
195
} 
196
##no saved widget sequence found, build default list.
197
else{
189 198
	$widgetlist = $widgetfiles;
190 199
}
191 200

  
......
234 243
}
235 244

  
236 245

  
237
function addDiv(selectedDiv){	
246
function addWidget(selectedDiv){	
238 247
	selectedDiv2 = selectedDiv + "-container";
239 248
	d = document;
240 249
	textlink = d.getElementById(selectedDiv2);
......
253 262
	}
254 263
}
255 264

  
256
function configureDiv(selectedDiv){
265
function configureWidget(selectedDiv){
257 266
	selectIntLink = selectedDiv + "-settings";	
258 267
	d = document;
259 268
	textlink = d.getElementById(selectIntLink);
......
263 272
		Effect.BlindUp(selectIntLink, {duration:1});
264 273
}
265 274

  
266
function showDiv(selectedDiv,swapButtons){
275
function showWidget(selectedDiv,swapButtons){
267 276
	//appear element
268 277
    Effect.BlindDown(selectedDiv, {duration:1});      
269 278
    showSave();    
......
285 294
    
286 295
}
287 296
	
288
function minimizeDiv(selectedDiv,swapButtons){
297
function minimizeWidget(selectedDiv,swapButtons){
289 298
	//fade element
290 299
    Effect.BlindUp(selectedDiv, {duration:1});      
291 300
    showSave();
......
305 314
    
306 315
}
307 316

  
308
function closeDiv(selectedDiv){	
317
function closeWidget(selectedDiv){	
309 318
	showSave();
310 319
	selectedDiv = selectedDiv + "-container";
311 320
	Effect.Fade(selectedDiv, {duration:1});
......
449 458
					{
450 459
						//echo widget title 
451 460
						?>
452
						<span style="cursor: pointer;" onclick='return addDiv("<?php echo $widgetname; ?>")'>
461
						<span style="cursor: pointer;" onclick='return addWidget("<?php echo $widgetname; ?>")'>
453 462
						<u><?php echo $$widgettitle; ?></u></span><br>
454 463
						<?php 
455 464
					}
456 465
					else {?>
457
						<span style="cursor: pointer;" onclick='return addDiv("<?php echo $widgetname; ?>")'>
466
						<span style="cursor: pointer;" onclick='return addWidget("<?php echo $widgetname; ?>")'>
458 467
						<u><?php echo $nicename; ?></u></span><br><?php
459 468
					}
460 469
			}
......
526 535
				$divdisplay = "block";
527 536
				$display = "block";
528 537
				$inputdisplay = "show";					
529
				$showdiv = "none";
538
				$showWidget = "none";
530 539
				$mindiv = "inline";
531 540
			}
532 541
			else if ($displayarray[$widgetcounter] == "hide") {
533 542
				$divdisplay = "block";
534 543
				$display = "none";
535 544
				$inputdisplay = "hide";		
536
				$showdiv = "inline";
545
				$showWidget = "inline";
537 546
				$mindiv = "none";
538 547
			}
539 548
			else if ($displayarray[$widgetcounter] == "close"){
540 549
				$divdisplay = "none";
541 550
				$display = "block";
542 551
				$inputdisplay = "close";			
543
				$showdiv = "none";
552
				$showWidget = "none";
544 553
				$mindiv = "inline";
545 554
			}
546 555
			else{
547 556
				$divdisplay = "none";
548 557
				$display = "block";
549 558
				$inputdisplay = "none";
550
				$showdiv = "none";
559
				$showWidget = "none";
551 560
				$mindiv = "inline";
552 561
			}
553 562
		}
......
557 566
				$divdisplay = "block";
558 567
				$display = "block";
559 568
				$inputdisplay = "show";					
560
				$showdiv = "none";
569
				$showWidget = "none";
561 570
				$mindiv = "inline";
562 571
				$firstprint = true;
563 572
			}
......
568 577
					$divdisplay = "block";
569 578
					$display = "block";
570 579
					$inputdisplay = "show";					
571
					$showdiv = "none";
580
					$showWidget = "none";
572 581
					$mindiv = "inline";
573 582
				}
574 583
				else if ($widget == "traffic_graphs.widget.php")
......
576 585
					$divdisplay = "block";
577 586
					$display = "block";
578 587
					$inputdisplay = "show";					
579
					$showdiv = "none";
588
					$showWidget = "none";
580 589
					$mindiv = "inline";
581 590
				}
582 591
				else {
583 592
					$divdisplay = "none";
584 593
					$display = "block";
585 594
					$inputdisplay = "close";			
586
					$showdiv = "none";
595
					$showWidget = "none";
587 596
					$mindiv = "inline";
588 597
				}
589 598
			}
......
641 650
					?>
642 651
				</div>
643 652
				<div align="right" style="float:right;">	
644
					<div id="<?php echo $widgetname;?>-configure" onclick='return configureDiv("<?php echo $widgetname;?>")' style="display:none; cursor:pointer" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_configure.gif" /></div>									
645
					<div id="<?php echo $widgetname;?>-open" onclick='return showDiv("<?php echo $widgetname;?>",true)' style="display:<?php echo $showdiv;?>; cursor:pointer" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_open.gif" /></div>	
646
					<div id="<?php echo $widgetname;?>-min" onclick='return minimizeDiv("<?php echo $widgetname;?>",true)' style="display:<?php echo $mindiv;?>; cursor:pointer" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_minus.gif"/></div>												
647
					<div id="<?php echo $widgetname;?>-close" onclick='return closeDiv("<?php echo $widgetname;?>",true)' style="display:inline; cursor:pointer" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_close.gif" /></div>	
653
					<div id="<?php echo $widgetname;?>-configure" onclick='return configureWidget("<?php echo $widgetname;?>")' style="display:none; cursor:pointer" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_configure.gif" /></div>									
654
					<div id="<?php echo $widgetname;?>-open" onclick='return showWidget("<?php echo $widgetname;?>",true)' style="display:<?php echo $showWidget;?>; cursor:pointer" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_open.gif" /></div>	
655
					<div id="<?php echo $widgetname;?>-min" onclick='return minimizeWidget("<?php echo $widgetname;?>",true)' style="display:<?php echo $mindiv;?>; cursor:pointer" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_minus.gif"/></div>												
656
					<div id="<?php echo $widgetname;?>-close" onclick='return closeWidget("<?php echo $widgetname;?>",true)' style="display:inline; cursor:pointer" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_close.gif" /></div>	
648 657
				</div>
649 658
				<div style="clear:both;"></div>
650 659
			</div>

Also available in: Unified diff