Skip to content

feat: Upgrade Bootstrap to v4.6.2 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ramadanilondo6-cell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Upgrade Bootstrap to v4.6.2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions application/modules/builder/views/template/_form_vertikal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
</div><!-- /.row -->

{php_open} echo form_open(site_url('{table}/' . $action),'role="form" class="form" id="form_{table}" data-parsley-validate'); {php_close}
<div class="panel panel-default">
<div class="panel-heading"><i class="glyphicon glyphicon-signal"></i> </div>
<div class="card">
<div class="card-header"><i class="fa fa-signal"></i> </div>

<div class="panel-body">
<div class="card-body">
{forms}
<div class="form-group">
<label for="{field}" class="control-label">{label}</label>
Expand All @@ -26,14 +26,14 @@

</div> <!--/ Panel Body -->

<div class="panel-footer">
<div class="card-footer">
<div class="row">
<div class="col-md-10 col-sm-12 col-md-offset-2 col-sm-offset-0">
<a href="{php_open} echo site_url('{table}'); {php_close}" class="btn btn-default">
<i class="glyphicon glyphicon-chevron-left"></i> Kembali
<div class="col-md-10 col-sm-12 offset-md-2 offset-sm-0">
<a href="{php_open} echo site_url('{table}'); {php_close}" class="btn btn-secondary">
<i class="fa fa-chevron-left"></i> Kembali
</a>
<button type="submit" class="btn btn-primary" name="post">
<i class="glyphicon glyphicon-floppy-save"></i> Simpan
<i class="fa fa-save"></i> Simpan
</button>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions application/modules/builder/views/template/form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
</div> -->

{php_open} echo form_open(site_url('{table}/' . $action),'role="form" class="form-horizontal" id="form_{table}" parsley-validate'); {php_close}
<div class="panel panel-default">
<div class="panel-heading"><i class="glyphicon glyphicon-edit"></i> </div>
<div class="card">
<div class="card-header"><i class="fa fa-edit"></i> </div>

<div class="panel-body">
<div class="card-body">

{forms}
<div class="form-group">
Expand All @@ -36,16 +36,16 @@
{/forms}

</div> <!--/ Panel Body -->
<div class="panel-footer">
<div class="card-footer">
<div class="row">
<!-- <div class="col-md-10 col-sm-12 col-md-offset-2 col-sm-offset-0"> -->
<!-- <div class="col-md-10 col-sm-12 offset-md-2 offset-sm-0"> -->
<div class="col-md-12 col-sm-12 col-lg-12 text-right">

<a href="{php_open} echo site_url('{table}'); {php_close}" class="btn btn-default">
<i class="glyphicon glyphicon-chevron-left"></i> Kembali
<a href="{php_open} echo site_url('{table}'); {php_close}" class="btn btn-secondary">
<i class="fa fa-chevron-left"></i> Kembali
</a>
<button type="submit" class="btn btn-primary" name="post">
<i class="glyphicon glyphicon-floppy-save"></i> Simpan
<i class="fa fa-save"></i> Simpan
</button>
</div>
</div>
Expand Down
22 changes: 11 additions & 11 deletions application/modules/builder/views/template/view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@
</div>
</div> -->

<section class="panel panel-default">
<header class="panel-heading">
<section class="card">
<header class="card-header">
<div class="row">
<div class="col-md-8 col-xs-3">
{php_open}
echo anchor(
site_url('{table}/add'),
'<i class="glyphicon glyphicon-plus"></i> Tambah',
'<i class="fa fa-plus"></i> Tambah',
'class="btn btn-success btn-sm" data-tooltip="tooltip" data-placement="top" title="Tambah Data"'
);
{php_close}
</div>
<div class="col-md-4 col-xs-9">

{php_open} echo form_open(site_url('{table}/search'), 'role="search" class="form"') ;?>
<div class="input-group pull-right">
<div class="input-group float-right">
<input type="text" class="form-control input-sm" placeholder="Cari data" name="q" autocomplete="off">
<span class="input-group-btn">
<button class="btn btn-primary btn-sm" type="submit"><i class="glyphicon glyphicon-search"></i> Cari</button>
<button class="btn btn-primary btn-sm" type="submit"><i class="fa fa-search"></i> Cari</button>
</span>
</div>

Expand All @@ -45,7 +45,7 @@
</header>


<div class="panel-body">
<div class="card-body">
{php_open} if (${table}s) : {php_close}
<table class="table table-hover table-condensed">

Expand Down Expand Up @@ -73,23 +73,23 @@
{php_open}
echo anchor(
site_url('{table}/show/' . ${table}['{primary_key}']),
'<i class="glyphicon glyphicon-eye-open"></i>',
'<i class="fa fa-eye"></i>',
'class="btn btn-sm btn-info" data-tooltip="tooltip" data-placement="top" title="Detail"'
);
{php_close}

{php_open}
echo anchor(
site_url('{table}/edit/' . ${table}['{primary_key}']),
'<i class="glyphicon glyphicon-edit"></i>',
'<i class="fa fa-edit"></i>',
'class="btn btn-sm btn-success" data-tooltip="tooltip" data-placement="top" title="Edit"'
);
{php_close}

{php_open}
echo anchor(
site_url('{table}/destroy/' . ${table}['{primary_key}']),
'<i class="glyphicon glyphicon-trash"></i>',
'<i class="fa fa-trash"></i>',
'onclick="return confirm(\'Apakah anda yakin ingin menghapus?\');" class="btn btn-sm btn-danger" data-tooltip="tooltip" data-placement="top" title="Hapus"'
);
{php_close}
Expand All @@ -105,11 +105,11 @@
</div>


<div class="panel-footer">
<div class="card-footer">
<div class="row">
<div class="col-md-3">
{table_name}
<span class="label label-info">
<span class="badge badge-info">
{php_open} echo $total; {php_close}
</span>
</div>
Expand Down
6 changes: 3 additions & 3 deletions application/views/generator/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
</div>

<div class="col-lg-9" >
<div class="panel panel-default">
<div class="panel-heading"><span class="fa fa-cog"></span> Form</div>
<div class="panel-body" id="proses"></div>
<div class="card">
<div class="card-header"><span class="fa fa-cog"></span> Form</div>
<div class="card-body" id="proses"></div>
</div>
</div>

38 changes: 17 additions & 21 deletions application/views/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,36 @@
<meta http-equiv="pragma" content="no-cache" />

<title>Home</title>
<link href="<?php echo base_url(); ?>assets/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
<link href="<?php echo base_url(); ?>assets/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="<?php echo base_url(); ?>assets/css/main.css" rel="stylesheet" type="text/css">
<link href="<?php echo base_url(); ?>assets/parsley/parsley.css" rel="stylesheet" type="text/css">
<link href="<?php echo base_url(); ?>assets/datepicker/datepicker3.min.css" rel="stylesheet" type="text/css">

<script type="text/javascript" src="<?php echo base_url(); ?>assets/jquery/jquery-2.1.1.min.js"></script>
</head>

<body>

<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top">
<div class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<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(); ?>">Brain Labs</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="<?php echo site_url('dashboard'); ?>"><i class="fa fa-windows"></i> Dahsboard</a></li>
<li><a href="<?php echo site_url('builder'); ?>"><i class="fa fa-code"></i> Builder</a></li>
<a class="navbar-brand" href="<?php echo site_url(); ?>">Brain Labs</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item"><a class="nav-link" href="<?php echo site_url('dashboard'); ?>"><i class="fa fa-windows"></i> Dahsboard</a></li>
<li class="nav-item"><a class="nav-link" href="<?php echo site_url('builder'); ?>"><i class="fa fa-code"></i> Builder</a></li>
<!-- <li><a href="<?php echo site_url('builder/tools'); ?>"><i class="fa fa-wrench"></i> Tools</a></li> -->
<?php
$menus = menu(APPPATH . 'modules/');
?>

<?php if($menus) : ?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-signal"></i> Content <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-signal"></i> Content <b class="caret"></b></a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">

<?php

Expand All @@ -57,15 +52,15 @@
{
if($val['name'] !='dashboard' && $val['name'] !='builder') :
?>
<li><a href="<?php echo site_url($val['name']); ?>"><?php echo $val['label']; ?></a></li>
<a class="dropdown-item" href="<?php echo site_url($val['name']); ?>"><?php echo $val['label']; ?></a>

<?php
endif;
}

?>

</ul>
</div>
</li>

<?php endif; ?>
Expand Down Expand Up @@ -98,7 +93,8 @@
<!--[if lt IE 9]>
<script type="text/javascript" src="<?php echo base_url(); ?>asset/js/html5shiv.js"></script>
<![endif]-->
<script type="text/javascript" src="<?php echo base_url(); ?>assets/bootstrap/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/holder.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/bootstrap.file-input.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/parsley/parsley.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion install/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<body>
<div class="container">
<div class="row">
<div class="col col-md-8 col-md-offset-2">
<div class="col col-md-8 offset-md-2">
<div class="page-header"><h1>Install</h1></div>
<?php if(is_writable($db_config_path)){?>

Expand Down