Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

merging changes

Browse Source
This commit is contained in:
Hillel Coren 2014-03-10 19:19:47 +02:00
parent 3050e915e2
commit dd1178ee16
2 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/views/about_us.blade.php
View File

@ -9,28 +9,41 @@
@stop @stop
@section('body') @section('body')
<!--<script>
$(document).ready(function () { {{ Form::open(array('url' => 'get_started', 'id' => 'startForm')) }}
var $window = $(window); {{ Form::hidden('guest_key') }}
$('section[data-type="background"]').each(function () { {{ Form::close() }}
var $bgobj = $(this);
$(window).scroll(function () { <script>
var yPos = -($window.scrollTop() / $bgobj.data('speed'));
var coords = '50% ' + yPos + 'px'; $(document).ready(function () {
$bgobj.css({ backgroundPosition: coords }); if (isStorageSupported()) {
}); $('[name="guest_key"]').val(localStorage.getItem('guest_key'));
}); }
}); });
</script>-->
function isStorageSupported() {
try {
return 'localStorage' in window && window['localStorage'] !== null;
} catch (e) {
return false;
}
}
function getStarted() {
$('#startForm').submit();
}
</script>
<div class="navbar" style="margin-bottom:0px"> <div class="navbar" style="margin-bottom:0px">
<div class="container"> <div class="container">
<div class="navbar-inner"> <div class="navbar-inner">
<a class="brand" href="#"><img src= <a class="brand" href="#"><img src=
"images/invoiceninja-logo.png"></a> "images/invoiceninja-logo.png"></a>
<ul class="navbar-list"> <ul class="navbar-list">
<li>{{ link_to('about_us', 'About Us' ) }}</li> <li>{{ link_to('about', 'About Us' ) }}</li>
<li>{{ link_to('contact_us', 'Contact Us' ) }}</li> <li>{{ link_to('contact', 'Contact Us' ) }}</li>
<li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li> <li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
</ul> </ul>
</div> </div>
</div> </div>
@ -88,6 +101,7 @@
</div> </div>
</div> </div>
</section> </section>
<!--
<section class="about center white-bg"> <section class="about center white-bg">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -102,6 +116,7 @@
</div> </div>
</div> </div>
</section> </section>
-->
<section class="upper-footer"> <section class="upper-footer">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -134,7 +149,9 @@
<div class="navbar-inner"> <div class="navbar-inner">
<ul class="navbar-list"> <ul class="navbar-list">
<li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li> <li>{{ link_to('about', 'About Us' ) }}</li>
<li>{{ link_to('contact', 'Contact Us' ) }}</li>
<li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
</ul> </ul>
<!-- <!--

45
app/views/contact_us.blade.php
View File

@ -16,29 +16,34 @@
{{ Form::close() }} {{ Form::close() }}
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("#feedbackSubmit").click(function() {
//clear any errors
contactForm.clearErrors();
//do a little client-side validation -- check that each field has a value and e-mail field is in proper format if (isStorageSupported()) {
var hasErrors = false; $('[name="guest_key"]').val(localStorage.getItem('guest_key'));
$('.feedbackForm input,textarea').each(function() {
if (!$(this).val()) {
hasErrors = true;
contactForm.addError($(this));
} }
});
var $email = $('#email');
if (!contactForm.isValidEmail($email.val())) {
hasErrors = true;
contactForm.addError($email);
}
//if there are any errors return without sending e-mail $("#feedbackSubmit").click(function() {
if (hasErrors) { //clear any errors
return false; contactForm.clearErrors();
}
//do a little client-side validation -- check that each field has a value and e-mail field is in proper format
var hasErrors = false;
$('.feedbackForm input,textarea').each(function() {
if (!$(this).val()) {
hasErrors = true;
contactForm.addError($(this));
}
});
var $email = $('#email');
if (!contactForm.isValidEmail($email.val())) {
hasErrors = true;
contactForm.addError($email);
}
//if there are any errors return without sending e-mail
if (hasErrors) {
return false;
}
}); });