Change header template (#116)

This commit is contained in:
FrancescoUK
2016-01-07 19:17:28 +00:00
parent a51352017a
commit 8bf77e27dc
5 changed files with 100 additions and 57 deletions

14
css/bootstrap.css → templates/flatly/css/bootstrap.css vendored Executable file → Normal file
View File

@@ -7062,18 +7062,4 @@ a.list-group-item-danger.active:focus {
}
.popover {
color: #2c3e50;
}
/* additional */
table.tablesorter tbody td.over {
background-color: #F5F5F5;
}
table.tablesorter tbody td.selected {
background-color: #ECECEC;
}
table.tablesorter thead tr th, table.tablesorter tfoot tr th {
padding: 8px;
}
#table_action_header {
height: 36px;
}

View File

@@ -0,0 +1,67 @@
/* additional styles placed here */
body {
padding-top: 60px;
}
.navbar {
min-height: 40px;
}
.navbar-brand {
padding: 10px 15px;
height: 41px;
}
table.tablesorter {
border: 0;
}
table.tablesorter tbody td.over {
background-color: #F5F5F5;
}
table.tablesorter tbody td.selected {
background-color: #ECECEC;
}
table.tablesorter thead tr th, table.tablesorter tfoot tr th {
padding: 8px;
}
#table_action_header {
height: 35px;
background-color: transparent;
border: 0;
}
table.tablesorter thead tr th, table.tablesorter tfoot tr th {
background-color: #18BC9C;
}
#search_filter_section {
padding: 5px;
margin-bottom: 10px;
}
#titleTextImg {
background-color: transparent !important;
}
#table_action_header ul li span a {
background-color: rgba(0, 0, 0, 0);
border: 0;
color: #aaa;
}
#table_action_header ul li span a:hover {
color: #555;
}
#title,
#page_title {
font-size: 32px;
margin-top: 21px;
margin-bottom: 10.5px;
font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
line-height: 1.1;
color: inherit;
}
#new_button {
bottom: 5px;
}
@media (min-width: 768px){
.navbar-nav > li > a {
padding-top: 10px;
padding-bottom: 10px;
}
}

View File

@@ -2,11 +2,7 @@
</div>
<div id="footer">
<?php echo $this->lang->line('common_you_are_using_ospos'); ?>
<?php echo $this->config->item('application_version'); ?>.
<?php echo $this->lang->line('common_please_visit_my'); ?>
<a href="https://github.com/jekkos/opensourcepos" target="_blank"><?php echo $this->lang->line('common_website'); ?></a>
<?php echo $this->lang->line('common_learn_about_project'); ?>
</div>
</body>
</html>

View File

@@ -6,7 +6,8 @@
<base href="<?php echo base_url();?>" />
<title><?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?></title>
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="templates/flatly/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="templates/flatly/css/style.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css" media="print" />
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
<!-- start js template tags -->
@@ -59,39 +60,32 @@ html {
</head>
<body>
<div id="menubar">
<div id="menubar_container">
<div id="menubar_company_info">
<span id="company_title"><?php echo $this->config->item('company'); ?></span><br />
<span style='font-size:8pt;'><?php echo $this->lang->line('common_powered_by').' Open Source Point Of Sale'; ?></span>
<body>
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<?php echo site_url(); ?>">OSPOS</a>
</div>
<div id="menubar_navigation">
<?php
foreach($allowed_modules->result() as $module)
{
?>
<div class="menu_item">
<a href="<?php echo site_url("$module->module_id");?>">
<img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Menubar Image"></a><br>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<?php foreach($allowed_modules->result() as $module): ?>
<li>
<a href="<?php echo site_url("$module->module_id");?>"><?php echo $this->lang->line("module_".$module->module_id) ?></a>
</div>
<?php
}
?>
</div>
<div id="menubar_footer">
<?php echo $this->lang->line('common_welcome')." $user_info->first_name $user_info->last_name! | "; ?>
<a href="javascript:logout(true);"><?php echo $this->lang->line("common_logout"); ?></a>
</div>
<div id="menubar_date">
<?php echo date($this->config->item('dateformat').' '.$this->config->item('timeformat')) ?>
</div>
</li>
<?php endforeach; ?>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
<div id="content_area_wrapper">
<div id="content_area">
<div class="container">
<div class="row-fluid">

View File

@@ -59,24 +59,24 @@ function post_person_form_submit(response)
</script>
<div id="title_bar">
<h2 class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></h2>
<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
<div id="new_button">
<?php echo anchor("$controller_name/view/-1/width:$form_width", $this->lang->line($controller_name.'_new'),
array('class'=>'thickbox none btn btn-primary','title'=>$this->lang->line($controller_name.'_new')));
array('class'=>'thickbox none btn btn-primary btn-sm','title'=>$this->lang->line($controller_name.'_new')));
?>
<?php if ($controller_name =='customers') {?>
<?php echo anchor("$controller_name/excel_import/width:$form_width",
$this->lang->line('common_import_excel'),
array('class'=>'thickbox none btn btn-primary','title'=>'Import Items from Excel'));
array('class'=>'thickbox none btn btn-primary btn-sm','title'=>'Import Items from Excel'));
?>
<?php } ?>
</div>
</div>
<div id="pagination" class="pagination"><?= $links ?></div>
<div id="pagination"><?= $links ?></div>
<div id="table_action_header">
<ul>
<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete', 'class' => 'btn btn-default btn-xs')); ?></span></li>
<li class="float_left"><span><a href="#" id="email" class="btn btn-default btn-xs"><?php echo $this->lang->line("common_email");?></a></span></li>
<li class="float_left"><span><?php echo anchor("$controller_name/delete",$this->lang->line("common_delete"),array('id'=>'delete', 'class' => '')); ?></span></li>
<li class="float_left"><span><a href="#" id="email" class=""><?php echo $this->lang->line("common_email");?></a></span></li>
<li class="float_right">
<img src='<?php echo base_url()?>images/spinner_small.gif' alt='spinner' id='spinner' />
<?php echo form_open("$controller_name/search",array('id'=>'search_form')); ?>