Skip to content
Snippets Groups Projects
Commit 8b1a6ab6 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'master' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone

parents 95441a31 e8dca534
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
www/contact.php
+ 2
− 0
View file @ 8b1a6ab6
<?php
$name = 'contact';
$javascript = array('jquery','animated-menu');
include('include/header.php');
......
www/download.php
+ 2
− 0
View file @ 8b1a6ab6
<?php
$name = 'download';
$javascript = array('jquery','animated-menu');
include_once('utils.php');
......
www/features.php
+ 4
− 1
View file @ 8b1a6ab6
<?php
$name = 'feature';
$javascript = array('jquery','animated-menu');
include('include/header.php');
?>
......@@ -15,12 +16,14 @@ include('include/header.php');
<p class="title alignLeft fntBleu">
Great User Experience
</p>
<p>
SFLphone now fully supports
<a href="http://www.pulseaudio.org">PulseAudio</a>
sound server so you could experience the great possibilities it offers (sound mixing, per application volume control, ...).
<br/>
The GTK+ graphical user interface provides you an intuitiv and easy way to phone, and, thanks to the integration of the GNOME desktop notification, you will never miss a call.
<br/>
</p>
</td>
</tr>
<tr>
......
www/include/header.php
+ 16
− 10
View file @ 8b1a6ab6
......@@ -8,10 +8,17 @@
<link rel="stylesheet" type="text/css" href="css/s3Slider.css" media="screen"/>
<!-- jquery -->
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/s3Slider.js"></script>
<script type="text/javascript" src="js/script.js"> </script>
<script type="text/javascript" src="js/animated-menu.js"></script>
<?php
//Inlucde javascript
$javascript = array_merge(array(),(array)$javascript);
foreach($javascript as $script){
echo "<script type='text/javascript' src='js/$script.js'></script>";
}
//<script type="text/javascript" src="js/jquery.js"></script>
//<script type="text/javascript" src="js/s3Slider.js"></script>
//<script type="text/javascript" src="js/script.js"> </script>
//<script type="text/javascript" src="js/animated-menu.js"></script>
?>
</head>
<body>
......@@ -37,15 +44,14 @@
<div id="navigation">
<div class="dynamic-nav" style="background: #CDCDCD;" >&nbsp;</div>
<ul>
<li><a href='contact.php'><span>Contact</span></a></li>
<li><a href='http://dev.savoirfairelinux.net/sflphone/'><span>Wiki</span></a></li>
<li class="active"><a href='download.php'><span>Download</span></a></li>
<li><a href='features.php'><span>Features</span></a></li>
<li><a href='index.php'><span>Home</span></a></li>
<li <?php echo ($name == 'contact')?'class="active"':"" ?>><a href='contact.php'><span>Contact</span></a></li>
<li <?php echo ($name == 'wiki')?'class="active"':"" ?>><a href='http://dev.savoirfairelinux.net/sflphone/'><span>Wiki</span></a></li>
<li <?php echo ($name == 'download')?'class="active"':"" ?>><a href='download.php'><span>Download</span></a></li>
<li <?php echo ($name == 'feature')?'class="active"':"" ?>><a href='features.php'><span>Features</span></a></li>
<li <?php echo ($name == 'home')?'class="active"':"" ?>><a href='index.php'><span>Home</span></a></li>
</ul>
</div>
</td>
</tr>
</tbody>
</table>
www/index.php
+ 2
− 1
View file @ 8b1a6ab6
<?php
$name = 'home';
$javascript = array('jquery','s3Slider','script','animated-menu');
include('include/header.php');
?>
......
www/js/animated-menu.js
+ 7
− 5
View file @ 8b1a6ab6
......@@ -11,10 +11,11 @@ $.fn.animatedMenu = function(){
var activePos;
$(element).children('li.active:first').each(
function(){
activePos = { left: this.offsetLeft, top: this.offsetTop, width: this.offsetWidth, height: this.offsetHeight}
this.opacity = 0;
activePos = { left: this.offsetLeft, top: this.offsetTop, width: this.offsetWidth, height: this.offsetHeight, opacity: 0}
}
);
$('div.dynamic-nav').hide(0,function(){$(this).animate(activePos,0);});
$('div.dynamic-nav').hide(1,function(){$(this).animate(activePos,1);});
$(element).children('li').hover(
function(){
......@@ -22,10 +23,11 @@ $.fn.animatedMenu = function(){
left: this.offsetLeft,
top: this.offsetTop,
width: this.offsetWidth,
height: this.offsetHeight
height: this.offsetHeight,
opacity: 1
}
$('div.dynamic-nav').show().animate(liPos,200);
$('div.dynamic-nav').stop().show().animate(liPos,500);
},
function(){
$('div.dynamic-nav').hide();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment