From 8cec1e1caa38f3f714c7c1f2da9ecc81b4cbf04d Mon Sep 17 00:00:00 2001
From: Farhan <mfarhan0304@gmail.com>
Date: Sun, 10 Feb 2019 22:31:25 +0700
Subject: [PATCH] change color scheme all
---
public/css/app.css | 1 +
public/js/app.js | 16 +++++-----
public/js/profile.js | 32 +++++++++++--------
.../assets/js/components/AdminNavbar.vue | 2 +-
.../assets/js/components/PMOMainPage.vue | 14 ++++----
.../assets/js/components/ProfilPegawai.vue | 20 ++++++------
.../js/components/ProfilPegawaiSpecific.vue | 20 ++++++------
.../views/layout-profile/footer.blade.php | 4 +--
.../views/layout-profile/master.blade.php | 1 +
resources/views/layout-profile/nav.blade.php | 2 +-
resources/views/layouts/app.blade.php | 4 +--
11 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/public/css/app.css b/public/css/app.css
index fa5c520..615814b 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -5100,6 +5100,7 @@ input[type="button"].btn-block {
margin-bottom: 0;
background-color: rgba(40, 185, 254, 0.8);
border-bottom: 1px solid rgba(40, 185, 254, 0.125);
+ font-size: 2.5vh;
color: #fff;
}
diff --git a/public/js/app.js b/public/js/app.js
index 677219b..43241c5 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -67956,7 +67956,7 @@ var render = function() {
},
[
_vm._v(
- "\n Download Data\n "
+ "\n Unduh Data\n "
)
]
)
@@ -67975,7 +67975,7 @@ var render = function() {
},
[
_vm._v(
- "\n Upload Data\n "
+ "\n Unggah Data\n "
)
]
)
@@ -68253,7 +68253,7 @@ var render = function() {
staticClass: "modal-title",
attrs: { id: "uploadModalLabel" }
},
- [_vm._v("Upload " + _vm._s(_vm.title))]
+ [_vm._v("Unggah " + _vm._s(_vm.title))]
),
_vm._v(" "),
_vm._m(1)
@@ -68263,7 +68263,7 @@ var render = function() {
_c("div", { staticClass: "container" }, [
_c("p", [
_vm._v(
- "\n Download format excel di bawah ini terlebih dahulu.\n "
+ "\n Unduh format excel di bawah ini terlebih dahulu.\n "
)
]),
_vm._v(" "),
@@ -68276,7 +68276,7 @@ var render = function() {
},
[
_vm._v(
- "\n Download Format Excel\n "
+ "\n Unduh Format Excel\n "
)
]
)
@@ -68322,7 +68322,7 @@ var render = function() {
attrs: { type: "button" },
on: { click: _vm.uploadFile }
},
- [_vm._v("Upload")]
+ [_vm._v("Unggah")]
)
])
])
@@ -68374,7 +68374,7 @@ var staticRenderFns = [
return _c("form", [
_c("div", { staticClass: "form-group container" }, [
_c("label", { attrs: { for: "upload-file" } }, [
- _vm._v("Upload data menggunakan file excel: ")
+ _vm._v("Unggah data menggunakan file excel: ")
]),
_vm._v(" "),
_c("input", {
@@ -68703,7 +68703,7 @@ var render = function() {
var _c = _vm._self._c || _h
return _c(
"nav",
- { staticClass: "navbar navbar-expand-md bg-primary navbar-dark" },
+ { staticClass: "navbar navbar-expand-md navbar-dark navbar-laravel" },
[
_c(
"a",
diff --git a/public/js/profile.js b/public/js/profile.js
index d37f4ae..60e334f 100644
--- a/public/js/profile.js
+++ b/public/js/profile.js
@@ -15375,7 +15375,7 @@ var render = function() {
on: { click: _vm.editProfilPegawai }
},
[
- _vm._v("\n Edit "),
+ _vm._v("\n Sunting "),
_c("i", { staticClass: "fas fa-edit" })
]
)
@@ -15998,7 +15998,7 @@ var render = function() {
}),
_vm._v(" "),
_c("small", { staticClass: "form-text text-muted" }, [
- _vm._v("*Edit pada data kepegawaian di bawah")
+ _vm._v("*Sunting pada data kepegawaian di bawah")
])
]
)
@@ -16054,7 +16054,7 @@ var render = function() {
on: { click: _vm.editDataKepegawaian }
},
[
- _vm._v("\n Edit "),
+ _vm._v("\n Sunting "),
_c("i", { staticClass: "fas fa-edit" })
]
)
@@ -16436,7 +16436,7 @@ var render = function() {
on: { click: _vm.editRiwayatPegawai }
},
[
- _vm._v("\n Edit "),
+ _vm._v("\n Sunting "),
_c("i", { staticClass: "fas fa-edit" })
]
)
@@ -17059,7 +17059,7 @@ var render = function() {
on: { click: _vm.editSertifikat }
},
[
- _vm._v("\n Edit "),
+ _vm._v("\n Sunting "),
_c("i", { staticClass: "fas fa-edit" })
]
)
@@ -17781,12 +17781,12 @@ var render = function() {
_c(
"button",
{
- staticClass: "btn btn-primary float-sm-left",
+ staticClass: "btn btn-success float-sm-left",
attrs: { disabled: _vm.disableEdit },
on: { click: _vm.downloadKompetensi }
},
[
- _vm._v("\n Download "),
+ _vm._v("\n Unduh "),
_c("i", { staticClass: "fas fa-download" })
]
)
@@ -20515,7 +20515,11 @@ var render = function() {
_c(
"small",
{ staticClass: "form-text text-muted" },
- [_vm._v("*Edit pada data kepegawaian di bawah")]
+ [
+ _vm._v(
+ "*Sunting pada data kepegawaian di bawah"
+ )
+ ]
)
]
)
@@ -21553,7 +21557,7 @@ var render = function() {
on: { click: _vm.editSertifikat }
},
[
- _vm._v("\n Edit "),
+ _vm._v("\n Sunting "),
_c("i", { staticClass: "fas fa-edit" })
]
)
@@ -21949,7 +21953,7 @@ var render = function() {
on: { click: _vm.editDataKinerja }
},
[
- _vm._v("\n Edit "),
+ _vm._v("\n Sunting "),
_c("i", { staticClass: "fas fa-edit" })
]
)
@@ -22288,7 +22292,7 @@ var render = function() {
on: { click: _vm.editKommpetensi }
},
[
- _vm._v("\n Edit "),
+ _vm._v("\n Sunting "),
_c("i", { staticClass: "fas fa-edit" })
]
)
@@ -22299,12 +22303,12 @@ var render = function() {
_c(
"button",
{
- staticClass: "btn btn-primary float-sm-left",
+ staticClass: "btn btn-success float-sm-left",
attrs: { disabled: _vm.disableEdit },
on: { click: _vm.downloadKompetensi }
},
[
- _vm._v("\n Download "),
+ _vm._v("\n Unduh "),
_c("i", { staticClass: "fas fa-download" })
]
)
@@ -22325,7 +22329,7 @@ var render = function() {
on: { click: _vm.editRekomendasi }
},
[
- _vm._v("\n Edit "),
+ _vm._v("\n Sunting "),
_c("i", { staticClass: "fas fa-edit" })
]
)
diff --git a/resources/assets/js/components/AdminNavbar.vue b/resources/assets/js/components/AdminNavbar.vue
index 363b406..800eda9 100644
--- a/resources/assets/js/components/AdminNavbar.vue
+++ b/resources/assets/js/components/AdminNavbar.vue
@@ -1,5 +1,5 @@
<template>
- <nav class="navbar navbar-expand-md bg-primary navbar-dark">
+ <nav class="navbar navbar-expand-md navbar-dark navbar-laravel">
<a class="navbar-brand font-weight-bold" href="#">UPT PMO</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
diff --git a/resources/assets/js/components/PMOMainPage.vue b/resources/assets/js/components/PMOMainPage.vue
index 762adec..e998c67 100644
--- a/resources/assets/js/components/PMOMainPage.vue
+++ b/resources/assets/js/components/PMOMainPage.vue
@@ -23,14 +23,14 @@
class="btn btn-success float-md-right m-1"
v-if="!disableDownloadDataButton"
@click="downloadData">
- Download Data
+ Unduh Data
</button>
<button type="button"
class="btn btn-primary float-md-right m-1"
data-toggle="modal"
data-target="#uploadModal"
v-if="!disableUploadDataButton">
- Upload Data
+ Unggah Data
</button>
</div>
</div>
@@ -87,7 +87,7 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
- <h5 class="modal-title" id="uploadModalLabel">Upload {{ title }}</h5>
+ <h5 class="modal-title" id="uploadModalLabel">Unggah {{ title }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
@@ -95,18 +95,18 @@
<div class="modal-body">
<div class="container">
<p>
- Download format excel di bawah ini terlebih dahulu.
+ Unduh format excel di bawah ini terlebih dahulu.
</p>
<button type="button"
class="btn btn-dark btn-sm"
@click="downloadTemplate">
- Download Format Excel
+ Unduh Format Excel
</button>
</div>
<br>
<form>
<div class="form-group container">
- <label for="upload-file">Upload data menggunakan file excel: </label>
+ <label for="upload-file">Unggah data menggunakan file excel: </label>
<input type="file" class="form-control-file" id="upload-file">
<small class="text-muted">Harap gunakan file Excel dengan format yang telah disediakan di atas.</small>
</div>
@@ -117,7 +117,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
- <button type="button" class="btn btn-primary" @click="uploadFile">Upload</button>
+ <button type="button" class="btn btn-primary" @click="uploadFile">Unggah</button>
</div>
</div>
</div>
diff --git a/resources/assets/js/components/ProfilPegawai.vue b/resources/assets/js/components/ProfilPegawai.vue
index 9c5f6bc..b306e41 100644
--- a/resources/assets/js/components/ProfilPegawai.vue
+++ b/resources/assets/js/components/ProfilPegawai.vue
@@ -4,7 +4,7 @@
<div class="card-header">
Profil Pegawai
<button class="btn btn-primary float-sm-right" v-on:click="editProfilPegawai" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button>
</div>
@@ -161,7 +161,7 @@
<div v-if="isEditProfile" id="edit-tahun-masuk" class="form-group">
<input v-model="pegawai.tahunMasuk" type="text" class="form-control">
- <small class="form-text text-muted">*Edit pada data kepegawaian di bawah</small>
+ <small class="form-text text-muted">*Sunting pada data kepegawaian di bawah</small>
</div>
</div>
</div>
@@ -187,7 +187,7 @@
<div class="card-header">
Data Kepegawaian
<button class="btn btn-primary float-sm-right" v-on:click="editDataKepegawaian" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button>
</div>
@@ -300,7 +300,7 @@
<div class="card" id="riwayat-pegawai">
<div class="card-header">
Riwayat Pendidikan dan Pekerjaan<button class="btn btn-primary float-sm-right" v-on:click="editRiwayatPegawai" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button>
</div>
@@ -475,7 +475,7 @@
<div class="card" id="sertificate">
<div class="card-header">
Sertifikat<button class="btn btn-primary float-sm-right" v-on:click="editSertifikat" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button>
</div>
@@ -596,7 +596,7 @@
<div class="card-header">
Hasil Kinerja
<!-- <button class="btn btn-primary float-sm-right" v-on:click="editDataKinerja" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
--> </button>
</div>
@@ -692,15 +692,15 @@
<div class="card-header">
Hasil Kompetensi
<!-- <button class="btn btn-primary float-sm-right" v-on:click="editDataKompetensi" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button> -->
</div>
<div class="card-body">
<div class="container">
- <button class="btn btn-primary float-sm-left" v-on:click="downloadKompetensi" v-bind:disabled="disableEdit">
- Download <i class="fas fa-download"></i>
+ <button class="btn btn-success float-sm-left" v-on:click="downloadKompetensi" v-bind:disabled="disableEdit">
+ Unduh <i class="fas fa-download"></i>
</button>
</div>
@@ -713,7 +713,7 @@
<div class="card-header">
Rekomendasi
<!-- <button class="btn btn-primary float-sm-right" v-on:click="editRekomendasi" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button> -->
</div>
diff --git a/resources/assets/js/components/ProfilPegawaiSpecific.vue b/resources/assets/js/components/ProfilPegawaiSpecific.vue
index 191f24d..e411557 100644
--- a/resources/assets/js/components/ProfilPegawaiSpecific.vue
+++ b/resources/assets/js/components/ProfilPegawaiSpecific.vue
@@ -4,7 +4,7 @@
<div class="card-header">
Profil Pegawai
<!-- <button class="btn btn-primary float-sm-right" v-on:click="editProfilPegawai" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button> -->
</div>
@@ -161,7 +161,7 @@
<div v-if="isEditProfile" id="edit-tahun-masuk" class="form-group">
<input v-model="pegawai.tahunMasuk" type="text" class="form-control">
- <small class="form-text text-muted">*Edit pada data kepegawaian di bawah</small>
+ <small class="form-text text-muted">*Sunting pada data kepegawaian di bawah</small>
</div>
</div>
</div>
@@ -187,7 +187,7 @@
<div class="card-header">
Data Kepegawaian
<!-- <button class="btn btn-primary float-sm-right" v-on:click="editDataKepegawaian" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button> -->
</div>
@@ -301,7 +301,7 @@
<div class="card-header">
Riwayat Pendidikan dan Pekerjaan
<!-- <button class="btn btn-primary float-sm-right" v-on:click="editRiwayatPegawai" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button> -->
</div>
@@ -476,7 +476,7 @@
<div class="card" id="sertificate">
<div class="card-header">
Sertifikat<button class="btn btn-primary float-sm-right" v-on:click="editSertifikat" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button>
</div>
@@ -596,7 +596,7 @@
<div class="card" id="data-kinerja">
<div class="card-header">
Hasil Kinerja<button class="btn btn-primary float-sm-right" v-on:click="editDataKinerja" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button>
</div>
@@ -691,15 +691,15 @@
<div class="card" id="data-kompetensi">
<div class="card-header">
Hasil Kompetensi<button class="btn btn-primary float-sm-right" v-on:click="editKommpetensi" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button>
</div>
<div class="card-body">
<div class="container">
- <button class="btn btn-primary float-sm-left" v-on:click="downloadKompetensi" v-bind:disabled="disableEdit">
- Download <i class="fas fa-download"></i>
+ <button class="btn btn-success float-sm-left" v-on:click="downloadKompetensi" v-bind:disabled="disableEdit">
+ Unduh <i class="fas fa-download"></i>
</button>
</div>
@@ -711,7 +711,7 @@
<div class="card" id="rekomendasi">
<div class="card-header">
Rekomendasi<button class="btn btn-primary float-sm-right" v-on:click="editRekomendasi" v-bind:disabled="disableEdit">
- Edit <i class="fas fa-edit"></i>
+ Sunting <i class="fas fa-edit"></i>
</button>
</div>
diff --git a/resources/views/layout-profile/footer.blade.php b/resources/views/layout-profile/footer.blade.php
index c00d514..32284f2 100644
--- a/resources/views/layout-profile/footer.blade.php
+++ b/resources/views/layout-profile/footer.blade.php
@@ -2,9 +2,9 @@
<footer class="footer">
<div class="container">
@if ($nama_pengubah === "Anda")
- <p class="float-right">Terakhir <b>{{$nama_pengubah}}</b> edit
+ <p class="float-right">Terakhir <b>{{$nama_pengubah}}</b> sunting
@else
- <p class="float-right">Terakhir diedit oleh <b>{{$nama_pengubah}}</b>
+ <p class="float-right">Terakhir disunting oleh <b>{{$nama_pengubah}}</b>
@endif
pada <b>{{$last_edited}}</b> <a class="btn btn-sm btn-primary"href="#"><i class="fas fa-angle-double-up"></i></a></p>
<p>© 2018 PMO ITB · </p>
diff --git a/resources/views/layout-profile/master.blade.php b/resources/views/layout-profile/master.blade.php
index 8fe515f..0dc83b8 100644
--- a/resources/views/layout-profile/master.blade.php
+++ b/resources/views/layout-profile/master.blade.php
@@ -16,6 +16,7 @@
<link href="/css/profile.css" rel="stylesheet">
+ <link href="/css/app.css" rel="stylesheet">
</head>
<body>
diff --git a/resources/views/layout-profile/nav.blade.php b/resources/views/layout-profile/nav.blade.php
index 600eb0d..9f36572 100644
--- a/resources/views/layout-profile/nav.blade.php
+++ b/resources/views/layout-profile/nav.blade.php
@@ -1,5 +1,5 @@
<div id="app">
- <nav class="navbar navbar-expand-md navbar-light navbar-laravel">
+ <nav class="navbar navbar-expand-md navbar-dark navbar-laravel">
<div class="container">
<a class="navbar-brand" href="{{ url('/pages') }}">
{{ config('app.name', 'Laravel') }}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 1e811f8..35101a3 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -43,7 +43,7 @@
<ul class="navbar-nav ml-auto">
<!-- Authentication Links -->
@guest
- <li><a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a></li>
+ <li><a class="nav-link" href="{{ route('login') }}">{{ __('Masuk') }}</a></li>
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
@@ -54,7 +54,7 @@
<a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
- {{ __('Logout') }}
+ {{ __('Keluar') }}
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
--
GitLab