[Xfce4-commits] <www:nick/gettext> Updates.

Nick Schermer noreply at xfce.org
Sun Jan 16 15:56:01 CET 2011


Updating branch refs/heads/nick/gettext
         to 49b7444cb675f1973f0a6aa0ec8f009fc77acfe0 (commit)
       from 00b4b8f5c1642dcebe6dca4f2a0d8bb9bf27c144 (commit)

commit 49b7444cb675f1973f0a6aa0ec8f009fc77acfe0
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 16 15:55:04 2011 +0100

    Updates.

 pages/download/index.php  |    2 +-
 pages/frontpage.php       |   40 ++++++++--------------------------------
 style/home.css            |    6 +++++-
 style/tiny.packed.js      |   31 +++++++++++++++++++++++++++++++
 style/tinybox.packed.js   |    1 -
 style/tinyfader.packed.js |    1 -
 6 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/pages/download/index.php b/pages/download/index.php
index 854851d..d085ce8 100644
--- a/pages/download/index.php
+++ b/pages/download/index.php
@@ -32,7 +32,7 @@ if($preview_visible) {
 
 <h2 id="individual"><?php E_('Individual releases') ?></h2>
 <p>
-  <?php E_('Each package in Xfce can make idividual stable or development releases, including the core packages (as discribed in the <a href="/about/releasemodel">release model</a>). You can follow the announcements of the releases on the <a href="/community/lists">Xfce users mailing list</a>, watch the <a href="http://archive.xfce.org/feeds/project/">release feeds</a> or follow the Xfce <a href="http://identi.ca/xfce">identi.ca channel</a>.') ?>
+  <?php E_('Each package in Xfce can make individual stable or development releases, including the core packages (as described in the <a href="/about/releasemodel">release model</a>). You can follow the announcements of the releases on the <a href="/community/lists">Xfce users mailing list</a>, watch the <a href="http://archive.xfce.org/feeds/project/">release feeds</a> or follow the Xfce <a href="http://identi.ca/xfce">identi.ca channel</a>.') ?>
 </p>
 
 <ul>
diff --git a/pages/frontpage.php b/pages/frontpage.php
index ead95f6..1fe2b68 100644
--- a/pages/frontpage.php
+++ b/pages/frontpage.php
@@ -7,12 +7,8 @@ $head['description'] = 'Xfce Desktop Environment';
 $head['keywords'] = 'desktop environment, window manager, desktop, speed, lightweight, gtk+, open source, xforms common environment';
 $head['stylesheet'] = array ('/style/home.css');
 $head['feed'] = 'http://www.xfce.org/feed?lang='.$lang;
-
 ?>
 
-<script type="text/javascript" src="/style/tinyfader.packed.js"></script>
-<script type="text/javascript" src="/style/tinybox.packed.js"></script>
-
 <div id="intro">
 
 <div id="intro-wrap">
@@ -23,44 +19,24 @@ $head['feed'] = 'http://www.xfce.org/feed?lang='.$lang;
 </p>
 
 <ul>
-  <li><a href="/download"><?php printf (R_('Download the lastest %s release'), $stable_version) ?></a></li>
-  <li><a href="/about/tour"><?php E_('Visual tour of Xfce 4.8') ?></a></li>
-  <li><a href="/about/screenshots"><?php E_('Screenshots') ?></a></li>
+  <li><a href="download"><?php printf (R_('Download the lastest %s release'), $stable_version) ?></a></li>
+  <li><a href="about/tour"><?php E_('Visual tour of Xfce 4.8') ?></a></li>
+  <li><a href="about/screenshots"><?php E_('Screenshots') ?></a></li>
 </ul>
 
 </div>
 <div id="slideshow">
   <ul id="slides">
-    <li><img src="/images/frontpage/intro-1-small.png" id="intro1" /></li>
-    <li><img src="/images/frontpage/intro-2-small.png" id="intro2" /></li>
-    <li><img src="/images/frontpage/intro-3-small.png" id="intro3" /></li>
-    <li><img src="/images/frontpage/intro-4-small.png" id="intro4" /></li>
+    <li><img src="images/frontpage/intro-1-small.png" id="intro1" alt="" /></li>
+    <li><img src="images/frontpage/intro-2-small.png" id="intro2" alt="" /></li>
+    <li><img src="images/frontpage/intro-3-small.png" id="intro3" alt="" /></li>
+    <li><img src="images/frontpage/intro-4-small.png" id="intro4" alt="" /></li>
   </ul>
 </div>
 <div class="clearboth"></div>
 </div>
 
-<script type="text/javascript">
-var slideshow=new TINY.fader.fade('slideshow',
-{
-  id:'slides',
-  auto:5,
-  visible:true,
-  position:0,
-  resume:true
-});
-
-T$('intro1').onclick = function(){TINY.box.show(
-  "<img src=\"images/frontpage/intro-1.png\" width=\"900\" height=\"600\" alt=\"\" />",0,900,600,0)}
-T$('intro2').onclick = function(){TINY.box.show(
-  "<img src=\"images/frontpage/intro-2.png\" width=\"900\" height=\"600\" alt=\"\" />",0,900,600,0)}
-T$('intro3').onclick = function(){TINY.box.show(
-  "<img src=\"images/frontpage/intro-3.png\" width=\"900\" height=\"600\" alt=\"\" />",0,900,600,0)}
-T$('intro4').onclick = function(){TINY.box.show(
-  "<img src=\"images/frontpage/intro-4.png\" width=\"900\" height=\"600\" alt=\"\" />",0,900,600,0)}
-
-
-</script>
+<script type="text/javascript" src="/style/tiny.packed.js"></script>
 
 <h2>Latest News</h2>
 <?php
diff --git a/style/home.css b/style/home.css
index 7688067..552869b 100644
--- a/style/home.css
+++ b/style/home.css
@@ -35,11 +35,15 @@
 	padding: 0;
 }
 
+#slides img {
+	cursor: pointer;
+}
+
 #tinybox {
 	position: absolute;
 	display: none;
 	padding: 0;
-	border: 10px solid #000;
+	border: 10px solid #eee;
 	z-index: 2000;
 }
 
diff --git a/style/tiny.packed.js b/style/tiny.packed.js
new file mode 100644
index 0000000..9fee1e9
--- /dev/null
+++ b/style/tiny.packed.js
@@ -0,0 +1,31 @@
+/* scripts from http://www.leigeber.com/ */
+var TINY={};
+
+/* tinyfader */
+function T$(i){return document.getElementById(i)}function T$$(e,p){return p.getElementsByTagName(e)}TINY.fader=function(){function fade(n,p){this.n=n;this.init(p)}fade.prototype.init=function(p){var s=T$(p.id),u=this.u=T$$('li',s),l=u.length,i=this.l=this.c=this.z=0;if(p.navid&&p.activeclass){this.g=T$$('li',T$(p.navid));this.s=p.activeclass}s.style.overflow='hidden';this.a=p.auto||0;this.p=p.resume||0;for(i;i<l;i++){if(u[i].parentNode==s){u[i].style.position='absolute';this.l++;u[i].o=p.visible?100:0;u[i].style.opacity=u[i].o/100;u[i].style.filter='alpha(opacity='+u[i].o+')'}}this.pos(p.position||0,this.a?1:0,p.visible)},fade.prototype.auto=function(){this.u.ai=setInterval(new Function(this.n+'.move(1,1)'),this.a*1000)},fade.prototype.move=function(d,a){var n=this.c+d,i=d==1?n==this.l?0:n:n<0?this.l-1:n;this.pos(i,a)},fade.prototype.pos=function(i,a,v){var p=this.u[i];this.z++;p.style.zIndex=this.z;clearInterval(p.si);clearInterval(this.u.ai);this.u.ai=0;this.c=i;if(p.o>=10
 0&&!v){p.o=0;p.style.opacity=0;p.style.filter='alpha(opacity=0)'}if(this.g){for(var x=0;x<this.l;x++){this.g[x].className=x==i?this.s:''}}p.si=setInterval(new Function(this.n+'.fade('+i+','+a+')'),20)},fade.prototype.fade=function(i,a){var p=this.u[i];if(p.o>=100){clearInterval(p.si);if((a||(this.a&&this.p))&&!this.u.ai){this.auto()}}else{p.o+=5;p.style.opacity=p.o/100;p.style.filter='alpha(opacity='+p.o+')'}};return{fade:fade}}();
+
+/* tinybox */
+function T$(i){return document.getElementById(i)}TINY.box=function(){var p,m,b,fn,ic,iu,iw,ih,ia,f=0;return{show:function(c,u,w,h,a,t){if(!f){p=document.createElement('div');p.id='tinybox';m=document.createElement('div');m.id='tinymask';b=document.createElement('div');b.id='tinycontent';document.body.appendChild(m);document.body.appendChild(p);p.appendChild(b);m.onclick=TINY.box.hide;window.onresize=TINY.box.resize;f=1}if(!a&&!u){p.style.width=w?w+'px':'auto';p.style.height=h?h+'px':'auto';p.style.backgroundImage='none';b.innerHTML=c}else{b.style.display='none';p.style.width=p.style.height='100px'}this.mask();ic=c;iu=u;iw=w;ih=h;ia=a;this.alpha(m,1,80,3);if(t){setTimeout(function(){TINY.box.hide()},1000*t)}},fill:function(c,u,w,h,a){if(u){p.style.backgroundImage='';var x=window.XMLHttpRequest?new XMLHttpRequest():new ActiveXObject('Microsoft.XMLHTTP');x.onreadystatechange=function(){if(x.readyState==4&&x.status==200){TINY.box.psh(x.responseText,w,h,a)}};x.open('GET',c,1);x.s
 end(null)}else{this.psh(c,w,h,a)}},psh:function(c,w,h,a){if(a){if(!w||!h){var x=p.style.width,y=p.style.height;b.innerHTML=c;p.style.width=w?w+'px':'';p.style.height=h?h+'px':'';b.style.display='';w=parseInt(b.offsetWidth);h=parseInt(b.offsetHeight);b.style.display='none';p.style.width=x;p.style.height=y}else{b.innerHTML=c}this.size(p,w,h)}else{p.style.backgroundImage='none'}},hide:function(){TINY.box.alpha(p,-1,0,3)},resize:function(){TINY.box.pos();TINY.box.mask()},mask:function(){m.style.height=TINY.page.total(1)+'px';m.style.width='';m.style.width=TINY.page.total(0)+'px'},pos:function(){var t=(TINY.page.height()/2)-(p.offsetHeight/2);t=t<10?10:t;p.style.top=(t+TINY.page.top())+'px';p.style.left=(TINY.page.width()/2)-(p.offsetWidth/2)+'px'},alpha:function(e,d,a){clearInterval(e.ai);if(d==1){e.style.opacity=0;e.style.filter='alpha(opacity=0)';e.style.display='block';this.pos()}e.ai=setInterval(function(){TINY.box.ta(e,a,d)},20)},ta:function(e,a,d){var o=Math.round(e.style.
 opacity*100);if(o==a){clearInterval(e.ai);if(d==-1){e.style.display='none';e==p?TINY.box.alpha(m,-1,0,2):b.innerHTML=p.style.backgroundImage=''}else{e==m?this.alpha(p,1,100):TINY.box.fill(ic,iu,iw,ih,ia)}}else{var n=Math.ceil((o+((a-o)*.5)));n=n==1?0:n;e.style.opacity=n/100;e.style.filter='alpha(opacity='+n+')'}},size:function(e,w,h){e=typeof e=='object'?e:T$(e);clearInterval(e.si);var ow=e.offsetWidth,oh=e.offsetHeight,wo=ow-parseInt(e.style.width),ho=oh-parseInt(e.style.height);var wd=ow-wo>w?0:1,hd=(oh-ho>h)?0:1;e.si=setInterval(function(){TINY.box.ts(e,w,wo,wd,h,ho,hd)},20)},ts:function(e,w,wo,wd,h,ho,hd){var ow=e.offsetWidth-wo,oh=e.offsetHeight-ho;if(ow==w&&oh==h){clearInterval(e.si);p.style.backgroundImage='none';b.style.display='block'}else{if(ow!=w){var n=ow+((w-ow)*.5);e.style.width=wd?Math.ceil(n)+'px':Math.floor(n)+'px'}if(oh!=h){var n=oh+((h-oh)*.5);e.style.height=hd?Math.ceil(n)+'px':Math.floor(n)+'px'}this.pos()}}}}();TINY.page=function(){return{top:function()
 {return document.documentElement.scrollTop||document.body.scrollTop},width:function(){return self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth},height:function(){return self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight},total:function(d){var b=document.body,e=document.documentElement;return d?Math.max(Math.max(b.scrollHeight,e.scrollHeight),Math.max(b.clientHeight,e.clientHeight)):Math.max(Math.max(b.scrollWidth,e.scrollWidth),Math.max(b.clientWidth,e.clientWidth))}}}();
+
+/* start slideshow */
+var slideshow=new TINY.fader.fade('slideshow',
+{
+  id:'slides',
+  auto:5,
+  visible:true,
+  position:0,
+  resume:true
+});
+
+/* slide click events */
+var content1 = '<img src="/images/frontpage/intro-1.png" width="900" height="600" alt="" />';
+T$('intro1').onclick = function(){TINY.box.show(content1,0,900,600,0)}
+
+var content2 = '<img src="/images/frontpage/intro-2.png" width="900" height="600" alt="" />';
+T$('intro2').onclick = function(){TINY.box.show(content2,0,900,600,0)}
+
+var content3 = '<img src="/images/frontpage/intro-3.png" width="900" height="600" alt="" />';
+T$('intro3').onclick = function(){TINY.box.show(content3,0,900,600,0)}
+
+var content4 = '<img src="/images/frontpage/intro-4.png" width="900" height="600" alt="" />';
+T$('intro4').onclick = function(){TINY.box.show(content4,0,900,600,0)}
diff --git a/style/tinybox.packed.js b/style/tinybox.packed.js
deleted file mode 100644
index 1e09ddf..0000000
--- a/style/tinybox.packed.js
+++ /dev/null
@@ -1 +0,0 @@
-function T$(i){return document.getElementById(i)}TINY.box=function(){var p,m,b,fn,ic,iu,iw,ih,ia,f=0;return{show:function(c,u,w,h,a,t){if(!f){p=document.createElement('div');p.id='tinybox';m=document.createElement('div');m.id='tinymask';b=document.createElement('div');b.id='tinycontent';document.body.appendChild(m);document.body.appendChild(p);p.appendChild(b);m.onclick=TINY.box.hide;window.onresize=TINY.box.resize;f=1}if(!a&&!u){p.style.width=w?w+'px':'auto';p.style.height=h?h+'px':'auto';p.style.backgroundImage='none';b.innerHTML=c}else{b.style.display='none';p.style.width=p.style.height='100px'}this.mask();ic=c;iu=u;iw=w;ih=h;ia=a;this.alpha(m,1,80,3);if(t){setTimeout(function(){TINY.box.hide()},1000*t)}},fill:function(c,u,w,h,a){if(u){p.style.backgroundImage='';var x=window.XMLHttpRequest?new XMLHttpRequest():new ActiveXObject('Microsoft.XMLHTTP');x.onreadystatechange=function(){if(x.readyState==4&&x.status==200){TINY.box.psh(x.responseText,w,h,a)}};x.open('GET',c,1);x.s
 end(null)}else{this.psh(c,w,h,a)}},psh:function(c,w,h,a){if(a){if(!w||!h){var x=p.style.width,y=p.style.height;b.innerHTML=c;p.style.width=w?w+'px':'';p.style.height=h?h+'px':'';b.style.display='';w=parseInt(b.offsetWidth);h=parseInt(b.offsetHeight);b.style.display='none';p.style.width=x;p.style.height=y}else{b.innerHTML=c}this.size(p,w,h)}else{p.style.backgroundImage='none'}},hide:function(){TINY.box.alpha(p,-1,0,3)},resize:function(){TINY.box.pos();TINY.box.mask()},mask:function(){m.style.height=TINY.page.total(1)+'px';m.style.width='';m.style.width=TINY.page.total(0)+'px'},pos:function(){var t=(TINY.page.height()/2)-(p.offsetHeight/2);t=t<10?10:t;p.style.top=(t+TINY.page.top())+'px';p.style.left=(TINY.page.width()/2)-(p.offsetWidth/2)+'px'},alpha:function(e,d,a){clearInterval(e.ai);if(d==1){e.style.opacity=0;e.style.filter='alpha(opacity=0)';e.style.display='block';this.pos()}e.ai=setInterval(function(){TINY.box.ta(e,a,d)},20)},ta:function(e,a,d){var o=Math.round(e.style.
 opacity*100);if(o==a){clearInterval(e.ai);if(d==-1){e.style.display='none';e==p?TINY.box.alpha(m,-1,0,2):b.innerHTML=p.style.backgroundImage=''}else{e==m?this.alpha(p,1,100):TINY.box.fill(ic,iu,iw,ih,ia)}}else{var n=Math.ceil((o+((a-o)*.5)));n=n==1?0:n;e.style.opacity=n/100;e.style.filter='alpha(opacity='+n+')'}},size:function(e,w,h){e=typeof e=='object'?e:T$(e);clearInterval(e.si);var ow=e.offsetWidth,oh=e.offsetHeight,wo=ow-parseInt(e.style.width),ho=oh-parseInt(e.style.height);var wd=ow-wo>w?0:1,hd=(oh-ho>h)?0:1;e.si=setInterval(function(){TINY.box.ts(e,w,wo,wd,h,ho,hd)},20)},ts:function(e,w,wo,wd,h,ho,hd){var ow=e.offsetWidth-wo,oh=e.offsetHeight-ho;if(ow==w&&oh==h){clearInterval(e.si);p.style.backgroundImage='none';b.style.display='block'}else{if(ow!=w){var n=ow+((w-ow)*.5);e.style.width=wd?Math.ceil(n)+'px':Math.floor(n)+'px'}if(oh!=h){var n=oh+((h-oh)*.5);e.style.height=hd?Math.ceil(n)+'px':Math.floor(n)+'px'}this.pos()}}}}();TINY.page=function(){return{top:function()
 {return document.documentElement.scrollTop||document.body.scrollTop},width:function(){return self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth},height:function(){return self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight},total:function(d){var b=document.body,e=document.documentElement;return d?Math.max(Math.max(b.scrollHeight,e.scrollHeight),Math.max(b.clientHeight,e.clientHeight)):Math.max(Math.max(b.scrollWidth,e.scrollWidth),Math.max(b.clientWidth,e.clientWidth))}}}();
diff --git a/style/tinyfader.packed.js b/style/tinyfader.packed.js
deleted file mode 100644
index 899eba3..0000000
--- a/style/tinyfader.packed.js
+++ /dev/null
@@ -1 +0,0 @@
-var TINY={};function T$(i){return document.getElementById(i)}function T$$(e,p){return p.getElementsByTagName(e)}TINY.fader=function(){function fade(n,p){this.n=n;this.init(p)}fade.prototype.init=function(p){var s=T$(p.id),u=this.u=T$$('li',s),l=u.length,i=this.l=this.c=this.z=0;if(p.navid&&p.activeclass){this.g=T$$('li',T$(p.navid));this.s=p.activeclass}s.style.overflow='hidden';this.a=p.auto||0;this.p=p.resume||0;for(i;i<l;i++){if(u[i].parentNode==s){u[i].style.position='absolute';this.l++;u[i].o=p.visible?100:0;u[i].style.opacity=u[i].o/100;u[i].style.filter='alpha(opacity='+u[i].o+')'}}this.pos(p.position||0,this.a?1:0,p.visible)},fade.prototype.auto=function(){this.u.ai=setInterval(new Function(this.n+'.move(1,1)'),this.a*1000)},fade.prototype.move=function(d,a){var n=this.c+d,i=d==1?n==this.l?0:n:n<0?this.l-1:n;this.pos(i,a)},fade.prototype.pos=function(i,a,v){var p=this.u[i];this.z++;p.style.zIndex=this.z;clearInterval(p.si);clearInterval(this.u.ai);this.u.ai=0;this.c=
 i;if(p.o>=100&&!v){p.o=0;p.style.opacity=0;p.style.filter='alpha(opacity=0)'}if(this.g){for(var x=0;x<this.l;x++){this.g[x].className=x==i?this.s:''}}p.si=setInterval(new Function(this.n+'.fade('+i+','+a+')'),20)},fade.prototype.fade=function(i,a){var p=this.u[i];if(p.o>=100){clearInterval(p.si);if((a||(this.a&&this.p))&&!this.u.ai){this.auto()}}else{p.o+=5;p.style.opacity=p.o/100;p.style.filter='alpha(opacity='+p.o+')'}};return{fade:fade}}();
\ No newline at end of file



More information about the Xfce4-commits mailing list