Skip to content

Commit

Permalink
Genel Derleme
Browse files Browse the repository at this point in the history
  • Loading branch information
arasosman committed Apr 22, 2018
1 parent 8a54eb9 commit 6b3dc48
Show file tree
Hide file tree
Showing 14 changed files with 1,081 additions and 108 deletions.
4 changes: 4 additions & 0 deletions .idea/blade.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

449 changes: 449 additions & 0 deletions .idea/dbnavigator.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .idea/deployment.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/enerjitakip.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/webServers.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ public static function authorization_edit_form($the_user){
return $return_value;
}

/*public static function get_modem_type($id){
public static function get_modem_type($id){
$return_value = '<div class="form-group"><label class="col-sm-3 control-label">'.trans('modem_management.modem_type').' <span style="color:red;">*</span></label><div class="col-sm-6"><select name="'.$id.'" id="'.$id.'" class="form-control" style="width:100%;">';

$result = DB::table("modem_type")->get();
Expand All @@ -568,7 +568,7 @@ public static function authorization_edit_form($the_user){
$return_value .= '</select></div></div>';

return $return_value;
} */
}

public static function fire_event($event_type,$the_user,$table_name="",$affected_id=0){

Expand Down
14 changes: 14 additions & 0 deletions app/Http/Controllers/Controller.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

namespace App\Http\Controllers;

use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;

class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;

}

This file was deleted.

13 changes: 1 addition & 12 deletions resources/lang/tr/system_summary.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,7 @@
'no_data_to_show' => 'Gösterilecek Veri Yok',
'last_order' => 'Son Siparişler',
'waiting_order' => 'Bekleyen Siparişler',
'waiting_booking' => 'Bekleyen İlanlar',
'order_title' => 'Adı',
'client_id' => 'Müşteri',
'seller_id' => 'Satıcı',
'order_date' => 'Tarih',
'detail' => 'Detay',
'last_sellers' => 'Satıcılar',
'last_client' => 'Müşteriler',
'client_name' => 'Müşteri adı',
'client_email' => 'Eposta',
'seller_name' => 'Satıcı Adı',
'seller_email' => 'Eposta',
'waiting_booking' => 'Bekleyen İlanlar'


];
12 changes: 6 additions & 6 deletions resources/views/auth/passwords/email.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">

<title>2M | {{ trans('login.forgot_password') }} </title>
<title>3Faz | {{ trans('login.forgot_password') }} </title>

<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/font-awesome/css/font-awesome.css">
Expand Down Expand Up @@ -64,7 +64,7 @@
</div>
<div class="row" style="margin-top:10px;">
<div class="col-xs-6">
<p style="margin-top:5px;"> <small> Copyright 2m Enerji &copy; 2016</small> </p>
<p style="margin-top:5px;"> <small> Copyright 3faz Enerji &copy; 2016</small> </p>
</div>
<div class="col-xs-6 text-right">
<button type="button" class="btn btn-success btn-sm" onclick="window.location.href='/login';">
Expand All @@ -75,10 +75,10 @@

<br />
<div class="text-center" style="padding:5px;">
<a href="http://www.2menerji.com/" title="2M Enerji" target="_blank">
<img class="img-responsive" alt="2M_Logo" style="max-height: 50px;display:inline;" src="/img/2m_logo.png" />
</a>
</div>
<a href="http://3fazmuhendislik.com" title="3faz mühendislik" target="_blank">
<img class="img-responsive" alt="3faz_Logo" style="max-height: 50px;display:inline;" src="http://3fazmuhendislik.com/wp-content/uploads/2017/08/3fazlogo.png" />
</a>
</div>
</div>
</body>
</html>
14 changes: 7 additions & 7 deletions resources/views/auth/passwords/reset.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">

<title>2M | {{ trans('login.reset_password_title') }} </title>
<title>3Faz | {{ trans('login.reset_password_title') }} </title>

<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/font-awesome/css/font-awesome.css">
Expand Down Expand Up @@ -92,7 +92,7 @@

<div class="row" style="margin-top:10px;">
<div class="col-xs-6">
<p style="margin-top:5px;"> <small> Copyright 2m Enerji &copy; 2016</small> </p>
<p style="margin-top:5px;"> <small> Copyright 3Faz Enerji &copy; 2016</small> </p>
</div>
<div class="col-xs-6 text-right">
<button type="button" class="btn btn-success btn-sm" onclick="window.location.href='/login';">
Expand All @@ -103,11 +103,11 @@

<br />

<div class="text-center" style="padding:5px;">
<a href="http://www.2menerji.com/" title="2M Enerji" target="_blank">
<img class="img-responsive" alt="2M_Logo" style="max-height: 50px;display:inline;" src="/img/2m_logo.png" />
</a>
</div>
<div class="text-center" style="padding:5px;">
<a href="http://3fazmuhendislik.com" title="3faz mühendislik" target="_blank">
<img class="img-responsive" alt="3faz_Logo" style="max-height: 50px;display:inline;" src="http://3fazmuhendislik.com/wp-content/uploads/2017/08/3fazlogo.png" />
</a>
</div>
</div>
</body>
</html>
Loading

0 comments on commit 6b3dc48

Please sign in to comment.