jfdelrio 16 jaren geleden
bovenliggende
commit
cd1f340af3

+ 7 - 11
admin/admin.php Bestand weergeven

@@ -26,19 +26,15 @@ if ($user->isAdmin()) {
26 26
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
27 27
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
28 28
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
29
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>
29
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
30
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
30 31
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/sortable.js"></script>
31 32
 		<script type="text/javascript">
32
-		<!--
33
-			window.onload = function() {
34
-				contenedor = new Fx.Style('divMessages', 'opacity', {duration: 5000, onComplete:
35
-					function() {
36
-						document.getElementById('divMessages').style.display="none";
37
-					}
38
-				});
39
-				contenedor.custom(1,0);
40
-			}
41
-		-->
33
+		$(document).ready(function(){
34
+			$("#divMessages").fadeOut(5000,function(){
35
+				$("#divMessages").css({display:"none"});
36
+			});
37
+		});
42 38
 		</script>
43 39
 		<style type="text/css" media="screen">	
44 40
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";

+ 6 - 11
admin/comments.php Bestand weergeven

@@ -68,19 +68,14 @@ if ($isAdmin) {
68 68
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
69 69
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
70 70
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
71
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>
71
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
72 72
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
73 73
 		<script language="javascript" type="text/javascript">
74
-		<!--
75
-			window.onload = function() {
76
-				contenedor = new Fx.Style('divMessages', 'opacity', {duration: 5000, onComplete:
77
-					function() {
78
-						document.getElementById('divMessages').style.display="none";
79
-					}
80
-				});
81
-				contenedor.custom(1,0);
82
-			}
83
-		-->
74
+		$(document).ready(function(){
75
+			$("#divMessages").fadeOut(5000,function(){
76
+				$("#divMessages").css({display:"none"});
77
+			});
78
+		});
84 79
 		</script>
85 80
 		<style type="text/css" media="screen">	
86 81
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";

BIN
admin/css/images/blank.gif Bestand weergeven


BIN
admin/css/images/close.gif Bestand weergeven


+ 92 - 0
admin/css/lightbox.css Bestand weergeven

@@ -0,0 +1,92 @@
1
+
2
+
3
+#lightbox{
4
+	position: absolute;
5
+	left: 0;
6
+	width: 100%;
7
+	z-index: 100;
8
+	text-align: center;
9
+	line-height: 0;
10
+	}
11
+
12
+#lightbox a img{ border: none; }
13
+
14
+#outerImageContainer{
15
+	position: relative;
16
+	background-color: #fff;
17
+	width: 250px;
18
+	height: 250px;
19
+	margin: 0 auto;
20
+	}
21
+
22
+#imageContainer{
23
+	padding: 10px;
24
+	}
25
+
26
+#loading{
27
+	position: absolute;
28
+	top: 40%;
29
+	left: 0%;
30
+	height: 25%;
31
+	width: 100%;
32
+	text-align: center;
33
+	line-height: 0;
34
+	}
35
+#hoverNav{
36
+	position: absolute;
37
+	top: 0;
38
+	left: 0;
39
+	height: 100%;
40
+	width: 100%;
41
+	z-index: 10;
42
+	}
43
+#imageContainer>#hoverNav{ left: 0;}
44
+#hoverNav a{ outline: none;}
45
+
46
+#prevLink, #nextLink{
47
+	width: 49%;
48
+	height: 100%;
49
+	background: transparent url(../images/blank.gif) no-repeat; /* Trick IE into showing hover */
50
+	display: block;
51
+	}
52
+#prevLink { left: 0; float: left;}
53
+#nextLink { right: 0; float: right;}
54
+#prevLink:hover, #prevLink:visited:hover { background: url(../images/prevlabel.gif) left 15% no-repeat; }
55
+#nextLink:hover, #nextLink:visited:hover { background: url(../images/nextlabel.gif) right 15% no-repeat; }
56
+
57
+
58
+#imageDataContainer{
59
+	font: 10px Verdana, Helvetica, sans-serif;
60
+	background-color: #fff;
61
+	margin: 0 auto;
62
+	line-height: 1.4em;
63
+	overflow: auto;
64
+	width: 100%	
65
+	}
66
+
67
+#imageData{	padding:0 10px; color: #666; }
68
+#imageData #imageDetails{ width: 70%; float: left; text-align: left; }	
69
+#imageData #caption{ font-weight: bold;	}
70
+#imageData #numberDisplay{ display: block; clear: left; padding-bottom: 1.0em;	}			
71
+#imageData #bottomNavClose{ width: 66px; float: right; margin: 1.0em;}	
72
+
73
+
74
+
75
+		
76
+#overlay{
77
+	position: absolute;
78
+	top: 0;
79
+	left: 0;
80
+	z-index: 90;
81
+	width: 100%;
82
+	height: 500px;
83
+	background-color: #000;
84
+	}
85
+	
86
+	
87
+/* * * * * V 0.3 * * * * * /
88
+/* html,body thanks to Torben  - http://blog.schreiter.info/ */
89
+html, body {
90
+	height:100%;
91
+	min-height:100%;
92
+}

+ 9 - 27
admin/index.php Bestand weergeven

@@ -96,37 +96,19 @@ if ($user->isAdmin()) {
96 96
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
97 97
 		<title>gelato :: <?php echo __("control panel")?></title>
98 98
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
99
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
99 100
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
100
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>
101
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/slimbox.js"></script>
101
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/lightbox.js"></script>
102 102
 		<script language="javascript" type="text/javascript">
103
-		<!--
104
-			function exit(el, path) {
105
-				el = $(el);
106
-				el.style.display="block";
107
-				el.setHTML('Processing request&hellip;');
108
-				new Ajax(path, {
109
-					onComplete:function(e) {
110
-						el.setHTML(e).effect('opacity').custom(0,1);
111
-						window.location='../login.php';
112
-					}
113
-				}).request();
114
-				return false;
115
-			}
116
-
117
-			window.onload = function() {
118
-				contenedor = new Fx.Style('divMessages', 'opacity', {duration: 5000, onComplete:
119
-					function() {
120
-						document.getElementById('divMessages').style.display="none";
121
-					}
122
-				});
123
-				contenedor.custom(1,0);
124
-			}
125
-		-->
103
+		$(document).ready(function(){
104
+			$("#divMessages").fadeOut(5000,function(){
105
+				$("#divMessages").css({display:"none"});
106
+			});
107
+		});
126 108
 		</script>
127 109
 		<style type="text/css" media="screen">	
128 110
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
129
-			@import "<?php echo $conf->urlGelato;?>/admin/css/slimbox.css";
111
+			@import "<?php echo $conf->urlGelato;?>/admin/css/lightbox.css";
130 112
 		</style>
131 113
 	</head>
132 114
 	
@@ -369,7 +351,7 @@ if ($user->isAdmin()) {
369 351
 										$photoPath = $register["url"];
370 352
 									}
371 353
 
372
-									$effect = " style=\"cursor: pointer;\" onclick=\"Lightbox.show('".$register["url"]."', '".strip_tags($register["description"])."');\" ";
354
+									$effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
373 355
 									
374 356
 									$input = array("{Id_Post}", "{Date_Added}", "{Permalink}", "{PhotoURL}", "{PhotoAlt}", "{Caption}", "{Effect}", "{URL_Tumble}");
375 357
 									$output = array($register["id_post"], $formatedDate, $permalink, $photoPath, strip_tags($register["description"]), $register["description"], $effect, $conf->urlGelato);

+ 7 - 12
admin/options.php Bestand weergeven

@@ -69,19 +69,14 @@ if ($user->isAdmin()) {
69 69
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
70 70
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
71 71
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
72
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>
72
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
73 73
 		<script type="text/javascript">
74
-		<!--
75
-			window.onload = function() {
76
-				contenedor = new Fx.Style('divMessages', 'opacity', {duration: 5000, onComplete:
77
-					function() {
78
-						document.getElementById('divMessages').style.display="none";
79
-					}
80
-				});
81
-				contenedor.custom(1,0);
82
-			}
83
-		-->
84
-		</script>	
74
+		$(document).ready(function(){
75
+			$("#divMessages").fadeOut(5000,function(){
76
+				$("#divMessages").css({display:"none"});
77
+			});
78
+		});
79
+		</script>		
85 80
 		<style type="text/css" media="screen">	
86 81
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";
87 82
 		</style>

Diff onderdrukt omdat het te groot bestand
+ 2992 - 0
admin/scripts/jquery.js


Diff onderdrukt omdat het te groot bestand
+ 364 - 0
admin/scripts/lightbox.js


+ 29 - 16
admin/scripts/tools.js Bestand weergeven

@@ -1,17 +1,15 @@
1
-//<!-- 
2
-
3 1
 function validateFrmAddUser() {
4
-	if ($('login').value == "") {
2
+	if ($("#login").value == "") {
5 3
 	   alert("The username field cannot be left blank.");
6 4
 	   document.frm_add.login.select();	
7 5
 	   return false;
8 6
 	}
9
-	if ($('password').value == "") {
7
+	if ($("#password").val() == "") {
10 8
 	   alert("The password field cannot be left blank.");
11 9
 	   document.frm_add.password.select();	
12 10
 	   return false;
13 11
 	}	
14
-	if ($('password').value != $('repass').value) {
12
+	if ($("#password").val() != $("#repass").val()) {
15 13
 	   alert("The password must match,\nplease verify them.");
16 14
 	   document.frm_add.password.focus();	
17 15
 	   return false;
@@ -19,17 +17,33 @@ function validateFrmAddUser() {
19 17
 	return true;
20 18
 }
21 19
 
22
-function verifyExistingUser() {
23
-	$('div-process').style.display="block";
24
-	el = $('target');
25
-	el.style.display="block";										
26
-	var path = 'ajax.php?action=verify&login='+$('login').value;
27
-	new Ajax(path, {
28
-		onComplete:function(e) {						
29
-			el.setHTML(e);
30
-			$('div-process').style.display="none";
20
+function verifyExistingUser() {	
21
+	$("#div-process").css({display:"block"});	
22
+	$("#target").css({display:"block"});		
23
+	$.ajax({
24
+		url: "ajax.php?action=verify&login="+$("#login").val(),
25
+		cache: false,
26
+		success: function(html){
27
+			$("#target").html(html);
28
+			$("#div-process").css({display:"none"});	
29
+			/*$("#login").css({display:"none"});*/	
30
+		}
31
+	});
32
+	return false;
33
+}
34
+
35
+function exit(el, path) {					
36
+	el=document.getElementById(el);		
37
+	$(el).css({display:"block"});
38
+	$(el).html("Processing request...");
39
+	$.ajax({
40
+		url: path,
41
+		cache: false,
42
+		success: function(html){
43
+			$(el).html(html);
44
+			window.location='../login.php';			
31 45
 		}
32
-	}).request();
46
+	});
33 47
 	return false;
34 48
 }
35 49
 
@@ -44,4 +58,3 @@ function selectFeedType(feed_url,username){
44 58
 		}
45 59
 }
46 60
 
47
-//-->

+ 6 - 11
admin/settings.php Bestand weergeven

@@ -32,18 +32,13 @@ if ($user->isAdmin()) {
32 32
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
33 33
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
34 34
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
35
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>
35
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
36 36
 		<script type="text/javascript">
37
-		<!--
38
-			window.onload = function() {
39
-				contenedor = new Fx.Style('divMessages', 'opacity', {duration: 5000, onComplete:
40
-					function() {
41
-						document.getElementById('divMessages').style.display="none";
42
-					}
43
-				});
44
-				contenedor.custom(1,0);
45
-			}
46
-		-->
37
+		$(document).ready(function(){
38
+			$("#divMessages").fadeOut(5000,function(){
39
+				$("#divMessages").css({display:"none"});
40
+			});
41
+		});
47 42
 		</script>	
48 43
 		<style type="text/css" media="screen">	
49 44
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";

+ 1 - 1
admin/themes/admin/template_photo.htm Bestand weergeven

@@ -4,6 +4,6 @@
4 4
 				</div>
5 5
 				<div class="post">
6 6
 					<span class="option">{Caption}</span>
7
-					<p><img src="{PhotoURL}" alt="{PhotoAlt}" {Effect} /></p>
7
+					<p><a {Effect}><img src="{PhotoURL}" alt="{PhotoAlt}" /></a></a></p>
8 8
 				</div>
9 9
 			</div>

+ 1 - 1
admin/user.php Bestand weergeven

@@ -53,7 +53,7 @@ if ($user->isAdmin()) {
53 53
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
54 54
 		<meta name="generator" content="gelato cms <?php echo version();?>" />
55 55
 		<link rel="shortcut icon" href="<?php echo $conf->urlGelato;?>/images/favicon.ico" />
56
-		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/mootools.js"></script>
56
+		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/jquery.js"></script>
57 57
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlGelato;?>/admin/scripts/tools.js"></script>
58 58
 		<style type="text/css" media="screen">	
59 59
 			@import "<?php echo $conf->urlGelato;?>/admin/css/style.css";