Permalink
Browse files

Revert "Layout Module updates: STILL INITIAL COMMIT"

This reverts commit a8de2a1.
  • Loading branch information...
1 parent a8de2a1 commit 150bbec5a6804b8484e5bf7326ec98a202c94f3d @klou committed Jan 20, 2014
@@ -10,8 +10,8 @@
*
* @package FusionInvoice
* @author Jesse Terry
- * @copyright Copyright (c) 2012 - 2013, Jesse Terry
- * @license http://www.fusioninvoice.com/support/page/license-agreement
+ * @copyright Copyright (c) 2012 - 2013 FusionInvoice, LLC
+ * @license http://www.fusioninvoice.com/license.txt
* @link http://www.fusioninvoice.com
*
*/
View
No changes.
View
@@ -12,7 +12,7 @@
<!-- Use the .htaccess and remove these lines to avoid edge case issues -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>Admin. Carson</title>
+ <title>FusionInvoice</title>
<meta name="description" content="">
<meta name="author" content="William G. Rivera">
@@ -22,7 +22,6 @@
<!-- Place favicon.ico and apple-touch-icon.png in the root directory: mathiasbynens.be/notes/touch-icons -->
<!-- CSS: implied media=all -->
- <link rel="stylesheet" href="<?php echo base_url() . 'assets/default/css/bootstrap.min.css'; ?>">
<link rel="stylesheet" href="<?php echo base_url() . 'assets/default/css/style.css'; ?>">
<!-- end CSS-->
@@ -39,7 +38,7 @@
</head>
-<body>
+<body style="overflow-y: visible;height:auto;">
<?php echo $content; ?>
@@ -57,4 +56,4 @@
<![endif]-->
</body>
-</html>
+</html>
@@ -1,4 +1,4 @@
<div class="pull-right">
- <button class="btn btn-primary" name="btn_submit" value="1"><i class="icon-ok icon-white"></i> <?php echo lang('save'); ?></button>
- <button class="btn btn-danger" name="btn_cancel" value="1"><i class="icon-remove icon-white"></i> <?php echo lang('cancel'); ?></button>
+ <button class="btn btn-primary" id="btn-submit" name="btn_submit" value="1"><i class="icon-ok icon-white"></i> <?php echo lang('save'); ?></button>
+ <button class="btn btn-danger" id="btn-cancel" name="btn_cancel" value="1"><i class="icon-remove icon-white"></i> <?php echo lang('cancel'); ?></button>
</div>
View
@@ -12,18 +12,17 @@
<!-- Use the .htaccess and remove these lines to avoid edge case issues -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>Administration Carson</title>
+ <title>FusionInvoice</title>
<meta name="description" content="">
<meta name="author" content="William G. Rivera">
<meta name="viewport" content="width=device-width,initial-scale=1">
- <link rel="stylesheet" href="<?php echo base_url(); ?>assets/default/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/default/css/style.css">
- <link rel="stylesheet" href="<?php echo base_url(); ?>assets/default/css/datepicker.css">
<script src="<?php echo base_url(); ?>assets/default/js/libs/modernizr-2.0.6.js"></script>
<script src="<?php echo base_url(); ?>assets/default/js/libs/jquery-1.7.1.min.js"></script>
+ <script src="<?php echo base_url(); ?>assets/default/js/libs/jquery-ui-1.10.3.min.js"></script>
<script src="<?php echo base_url(); ?>assets/default/js/libs/bootstrap.min.js"></script>
<script type="text/javascript">
@@ -38,10 +37,6 @@
$('.create-invoice').click(function() {
$('#modal-placeholder').load("<?php echo site_url('invoices/ajax/modal_create_invoice'); ?>");
});
-
- $('.search_inventory').click(function() {
- $('#modal-placeholder').load("<?php echo site_url('inventory/ajax/modal_search_inventory'); ?>");
- });
$('.create-quote').click(function() {
$('#modal-placeholder').load("<?php echo site_url('quotes/ajax/modal_create_quote'); ?>");
@@ -57,6 +52,11 @@
$('#modal-placeholder').load("<?php echo site_url('invoices/ajax/modal_copy_invoice'); ?>", {invoice_id: invoice_id});
});
+ $('#btn_copy_quote').click(function() {
+ quote_id = $(this).data('quote-id');
+ $('#modal-placeholder').load("<?php echo site_url('quotes/ajax/modal_copy_quote'); ?>", {quote_id: quote_id});
+ });
+
$('.client-create-invoice').click(function() {
$('#modal-placeholder').load("<?php echo site_url('invoices/ajax/modal_create_invoice'); ?>", {
client_name: $(this).data('client-name')
@@ -67,6 +67,11 @@
client_name: $(this).data('client-name')
});
});
+ $(document).on('click', '.invoice-add-payment', function() {
+ invoice_id = $(this).data('invoice-id');
+ invoice_balance = $(this).data('invoice-balance');
+ $('#modal-placeholder').load("<?php echo site_url('payments/ajax/modal_add_payment'); ?>", {invoice_id: invoice_id, invoice_balance: invoice_balance });
+ });
});
@@ -80,7 +85,7 @@
<div class="navbar-inner">
- <div class="container-fluid">
+ <div class="container">
<ul class="nav">
@@ -95,11 +100,19 @@
</li>
<li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo lang('quotes'); ?><b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#" class="create-quote"><?php echo lang('create_quote'); ?></a></li>
+ <li><?php echo anchor('quotes/index', lang('view_quotes')); ?></li>
+ </ul>
+ </li>
+
+ <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo lang('invoices'); ?><b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#" class="create-invoice"><?php echo lang('create_invoice'); ?></a></li>
<li><?php echo anchor('invoices/index', lang('view_invoices')); ?></li>
- <li><?php echo anchor('invoices/recurring/index', lang('view_recurring_invoices')); ?></li>
+ <li><?php echo anchor('invoices/recurring/index', lang('view_recurring_invoices')); ?></li>
</ul>
</li>
@@ -112,56 +125,45 @@
</li>
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dépenses<b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><?php echo anchor('depenses/form', "Nouvelle dépense"); ?></li>
- <li><?php echo anchor('depenses/index', "Voir dépenses"); ?></li>
- </ul>
- </li>
-
- <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo lang('reports'); ?><b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><?php echo anchor('reports/report_inventory', "Rapport Inventaire"); ?></li>
+ <li><?php echo anchor('reports/invoice_aging', lang('invoice_aging')); ?></li>
<li><?php echo anchor('reports/payment_history', lang('payment_history')); ?></li>
<li><?php echo anchor('reports/sales_by_client', lang('sales_by_client')); ?></li>
- <li><?php echo anchor('reports/price_list', "Liste de prix"); ?></li>
</ul>
</li>
+ </ul>
<?php if (isset($filter_display) and $filter_display == TRUE) { ?>
<?php $this->layout->load_view('filter/jquery_filter'); ?>
<form class="navbar-search pull-left">
<input type="text" class="search-query" id="filter" placeholder="<?php echo $filter_placeholder; ?>">
</form>
- <?php
- if(strstr($_SERVER['REQUEST_URI'], "inventory")){
- ?>
- <li><a href="#" class="search_inventory">+</a></li>
- <?php }
- } ?>
- </ul>
+ <?php } ?>
<ul class="nav pull-right settings">
+ <li><a href="#"><?php echo lang('welcome') . ' ' . $this->session->userdata('user_name'); ?></a></li>
+ <li class="divider-vertical"></li>
+ <li><a href="http://docs.fusioninvoice.com/1.3/" target="_blank" class="tip icon" data-original-title="Documentation" data-placement="bottom"><i class="icon-question-sign"></i></a></li>
+ <li class="divider-vertical"></li>
<li class="dropdown">
- <a href="#" class="tip icon dropdown-toggle" data-toggle="dropdown" data-original-title="<?php echo lang('settings'); ?>" data-placement="bottom"><img src="<?php echo base_url(); ?>assets/default/img/icons/settings.png"></a>
+ <a href="#" class="tip icon dropdown-toggle" data-toggle="dropdown" data-original-title="<?php echo lang('settings'); ?>" data-placement="bottom"><i class="icon-cog"></i></a>
<ul class="dropdown-menu">
- <!--<li><?php //echo anchor('custom_fields/index', lang('custom_fields')); ?></li>--!>
- <!-- <li><?php //echo anchor('email_templates/index', lang('email_templates')); ?></li>--!>
- <!-- <li><?php //echo anchor('import', lang('import_data')); ?></li> --!>
- <!--<li><?php //echo anchor('invoice_groups/index', lang('invoice_groups')); ?></li> --!>
+ <li><?php echo anchor('custom_fields/index', lang('custom_fields')); ?></li>
+ <li><?php echo anchor('email_templates/index', lang('email_templates')); ?></li>
+ <li><?php echo anchor('import', lang('import_data')); ?></li>
+ <li><?php echo anchor('invoice_groups/index', lang('invoice_groups')); ?></li>
+ <li><?php echo anchor('item_lookups/index', lang('item_lookups')); ?></li>
<li><?php echo anchor('payment_methods/index', lang('payment_methods')); ?></li>
- <li><?php echo anchor('devises/index', "Type devises"); ?></li>
- <li><?php echo anchor('depense_methods/index', "Catégorie Dépense"); ?></li>
<li><?php echo anchor('tax_rates/index', lang('tax_rates')); ?></li>
<li><?php echo anchor('users/index', lang('user_accounts')); ?></li>
- <li class="divider"></li>
- <li><?php echo anchor('settings', lang('system_settings')); ?></li>
+ <li class="divider"></li>
+ <li><?php echo anchor('settings', lang('system_settings')); ?></li>
</ul>
</li>
<li class="divider-vertical"></li>
- <li><a href="<?php echo site_url('sessions/logout'); ?>" class="tip icon logout" data-original-title="<?php echo lang('logout'); ?>" data-placement="bottom"><img src="<?php echo base_url(); ?>assets/default/img/icons/logout.png"></a></li>
+ <li><a href="<?php echo site_url('sessions/logout'); ?>" class="tip icon logout" data-original-title="<?php echo lang('logout'); ?>" data-placement="bottom"><i class="icon-off"></i></a></li>
</ul>
</div>
@@ -175,9 +177,9 @@
<ul>
<li><a href="<?php echo site_url('dashboard'); ?>"><img alt="" src="<?php echo base_url(); ?>assets/default/img/icons/dashboard24x24.png" title="<?php echo lang('dashboard'); ?>" /></a></li>
<li><a href="<?php echo site_url('clients/index'); ?>"><img alt="" src="<?php echo base_url(); ?>assets/default/img/icons/clients24x24.png" title="<?php echo lang('clients'); ?>" /></a></li>
+ <li><a href="<?php echo site_url('quotes/index'); ?>"><img alt="" src="<?php echo base_url(); ?>assets/default/img/icons/quotes24x24.png" title="<?php echo lang('quotes'); ?>" /></a></li>
<li><a href="<?php echo site_url('invoices/index'); ?>"><img alt="" src="<?php echo base_url(); ?>assets/default/img/icons/invoices24x24.png" title="<?php echo lang('invoices'); ?>" /></a></li>
<li><a href="<?php echo site_url('payments/index'); ?>"><img alt="" src="<?php echo base_url(); ?>assets/default/img/icons/payments24x24.png" title="<?php echo lang('payments'); ?>" /></a></li>
- <li><a href="<?php echo site_url('depenses/index'); ?>"><img alt="" src="<?php echo base_url(); ?>assets/default/img/icons/depense.png" title="Dépense" /></a></li>
</ul>
</div>
@@ -207,4 +209,4 @@
<![endif]-->
</body>
-</html>
+</html>
@@ -18,9 +18,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
- <link rel="stylesheet" href="<?php echo base_url(); ?>assets/default/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/default/css/style.css">
- <link rel="stylesheet" href="<?php echo base_url(); ?>assets/default/css/datepicker.css">
<script src="<?php echo base_url(); ?>assets/default/js/libs/modernizr-2.0.6.js"></script>
<script src="<?php echo base_url(); ?>assets/default/js/libs/jquery-1.7.1.min.js"></script>
@@ -44,7 +42,8 @@
</ul>
<ul class="nav pull-right settings">
- <li><a href="<?php echo site_url('sessions/logout'); ?>" class="tip icon logout" data-original-title="<?php echo lang('logout'); ?>" data-placement="bottom"><img src="<?php echo base_url(); ?>assets/default/img/icons/logout.png"></a></li>
+ <li><a href="#"><?php echo lang('welcome') . ' ' . $this->session->userdata('user_name'); ?></a></li>
+ <li><a href="<?php echo site_url('sessions/logout'); ?>" class="tip icon logout" data-original-title="<?php echo lang('logout'); ?>" data-placement="bottom"><i class="icon-off"></i></a></li>
</ul>
</div>

0 comments on commit 150bbec

Please sign in to comment.