diversen opmerkingen

This commit is contained in:
2018-07-29 10:11:02 +02:00
parent cecbfd83fb
commit 30535f7048
34 changed files with 11883 additions and 82 deletions
@@ -0,0 +1,366 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="viewport" content="width=device-width"/>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>wachtwoord DBOIS</title>
<link href="styles.css" media="all" rel="stylesheet" type="text/css"/>
</head>
<style>
/* -------------------------------------
GLOBAL
------------------------------------- */
* {
margin: 0;
padding: 0;
font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
box-sizing: border-box;
font-size: 14px;
}
img {
max-width: 100%;
}
body {
-webkit-font-smoothing: antialiased;
-webkit-text-size-adjust: none;
width: 100% !important;
height: 100%;
line-height: 1.6;
}
/* Let's make sure all tables have defaults */
table td {
vertical-align: top;
}
/* -------------------------------------
BODY & CONTAINER
------------------------------------- */
body {
background-color: #f6f6f6;
}
.body-wrap {
background-color: #f6f6f6;
width: 100%;
}
.container {
display: block !important;
max-width: 600px !important;
margin: 0 auto !important;
/* makes it centered */
clear: both !important;
}
.content {
max-width: 600px;
margin: 0 auto;
display: block;
padding: 20px;
}
/* -------------------------------------
HEADER, FOOTER, MAIN
------------------------------------- */
.main {
background: #fff;
border: 1px solid #e9e9e9;
border-radius: 3px;
}
.content-wrap {
padding: 20px;
}
.content-block {
padding: 0 0 20px;
}
.header {
width: 100%;
margin-bottom: 20px;
}
.footer {
width: 100%;
clear: both;
color: #999;
padding: 20px;
}
.footer a {
color: #999;
}
.footer p, .footer a, .footer unsubscribe, .footer td {
font-size: 12px;
}
/* -------------------------------------
GRID AND COLUMNS
------------------------------------- */
.column-left {
float: left;
width: 50%;
}
.column-right {
float: left;
width: 50%;
}
/* -------------------------------------
TYPOGRAPHY
------------------------------------- */
h1, h2, h3 {
font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
color: #000;
margin: 40px 0 0;
line-height: 1.2;
font-weight: 400;
}
h1 {
font-size: 32px;
font-weight: 500;
}
h2 {
font-size: 24px;
}
h3 {
font-size: 18px;
}
h4 {
font-size: 14px;
font-weight: 600;
}
p, ul, ol {
margin-bottom: 10px;
font-weight: normal;
}
p li, ul li, ol li {
margin-left: 5px;
list-style-position: inside;
}
/* -------------------------------------
LINKS & BUTTONS
------------------------------------- */
a {
color: #348eda;
text-decoration: underline;
}
.btn-primary {
text-decoration: none;
color: #FFF;
background-color: #348eda;
border: solid #348eda;
border-width: 10px 20px;
line-height: 2;
font-weight: bold;
text-align: center;
cursor: pointer;
display: inline-block;
border-radius: 5px;
text-transform: capitalize;
}
/* -------------------------------------
OTHER STYLES THAT MIGHT BE USEFUL
------------------------------------- */
.last {
margin-bottom: 0;
}
.first {
margin-top: 0;
}
.padding {
padding: 10px 0;
}
.aligncenter {
text-align: center;
}
.alignright {
text-align: right;
}
.alignleft {
text-align: left;
}
.clear {
clear: both;
}
/* -------------------------------------
Alerts
------------------------------------- */
.alert {
font-size: 16px;
color: #fff;
font-weight: 500;
padding: 20px;
text-align: center;
border-radius: 3px 3px 0 0;
}
.alert a {
color: #fff;
text-decoration: none;
font-weight: 500;
font-size: 16px;
}
.alert.alert-warning {
background: #ff9f00;
}
.alert.alert-bad {
background: #d0021b;
}
.alert.alert-good {
background: #68b90f;
}
/* -------------------------------------
INVOICE
------------------------------------- */
.invoice {
margin: 40px auto;
text-align: left;
width: 80%;
}
.invoice td {
padding: 5px 0;
}
.invoice .invoice-items {
width: 100%;
}
.invoice .invoice-items td {
border-top: #eee 1px solid;
}
.invoice .invoice-items .total td {
border-top: 2px solid #333;
border-bottom: 2px solid #333;
font-weight: 700;
}
/* -------------------------------------
RESPONSIVE AND MOBILE FRIENDLY STYLES
------------------------------------- */
@media only screen and (max-width: 640px) {
h1, h2, h3, h4 {
font-weight: 600 !important;
margin: 20px 0 5px !important;
}
h1 {
font-size: 22px !important;
}
h2 {
font-size: 18px !important;
}
h3 {
font-size: 16px !important;
}
.container {
width: 100% !important;
}
.content, .content-wrapper {
padding: 10px !important;
}
.invoice {
width: 100% !important;
}
}
</style>
<body>
<table class="body-wrap">
<tr>
<td></td>
<td class="container" width="600">
<div class="content">
<table class="main" width="100%" cellpadding="0" cellspacing="0">
<tr>
<td class="alert alert-warning">
Nieuw wachtwoord DBOIS De Beleidsonderzoeker
</td>
</tr>
<tr>
<td class="content-wrap">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td class="content-block">
<p>
Beste <?= $user['firstname']?> <?=$user['middlename']?> <?=$user['lastname']?>
</p>
<p>
U heeft een wachtwoord aangevraagd voor DBOIS, hieronder vindt u uw gebruikersnaam en uw nieuwe wachtwoord waarmee u kunt inloggen in het systeem.
</p>
</td>
</tr>
<tr>
<td class="content-block">
<table class="invoice">
<tr>
<td>
<table class="invoice-items" cellpadding="0" cellspacing="0">
<tr>
<td>gebruikersnaam</td>
<td class="alignright"><?= $user['username'] ?></td>
</tr>
<tr>
<td>wacthwoord</td>
<td class="alignright"><?= $user['password'] ?></td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="content-block">
<a href="<?php echo getenv('APP_URL'); ?>" class="btn-primary">
Ga naar het informatiesysteem
</a>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
<td></td>
</tr>
</table>
</body>
</html>
+12 -15
View File
@@ -311,12 +311,22 @@
<table class="main" width="100%" cellpadding="0" cellspacing="0">
<tr>
<td class="alert alert-warning">
Wachtwoord De Beleidsonderzoeker IS
Wachtwoord De Beleidsonderzoeker
</td>
</tr>
<tr>
<td class="content-wrap">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td class="content-block">
<p>
Beste <?= $user['firstname']?> <?=$user['middlename']?> <?=$user['lastname']?>
</p>
<p>
Er is voor u een account aangemaakt is het informatiesysteem van de Beleidsonderzoekers, hieronder vindt u uw gebruikersnaam en wachtwoord waarmee u kunt inloggen in het systeem.
</p>
</td>
</tr>
<tr>
<td class="content-block">
Hieronder vindt u uw gebruikersnaam wachtwoord om in te loggen op het
@@ -325,19 +335,6 @@
</tr>
<tr>
<td class="content-block">
<p>
Beste <?= $user['firstname']?> <?=$user['middlename']?> <?=$user['lastname']?>
</p>
<p>
Er is voor u een account aangemaakt is het informatiesysteem van de Beleidsonderzoekers, hieronder vindt u uw gebruikersnaam en wachtwoord waarmee u kun t inloggen in het systeem.
</p>
<br />
<br />
</td>
</tr>
<tr>
<td class="content-block">
<table class="invoice">
<tr>
<td>
@@ -359,7 +356,7 @@
<tr>
<td class="content-block">
<a href="<?php echo getenv('APP_URL'); ?>" class="btn-primary">
Ga naar de website
Ga naar het informatiesysteem
</a>
</td>
</tr>
+16
View File
@@ -32,6 +32,22 @@
</small>
</div>
</div>
<div class="form-group row">
<label class="col-md-3 control-label">
offerte naam
</label>
<div class="col-md-9">
<div class="input-group input-group-icon">
<span class="input-group-addon">
<i class="icon fa-bookmark"></i>
</span>
<input type="text"
placeholder="offerte naam"
class="form-control"
data-bind="textInput:offername">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-md-3 control-label">
offerte leider
+17 -17
View File
@@ -7,7 +7,7 @@
<div class="panel-body panel-body-project">
<table class="table table-sm">
<thead>
<th class="table-cyanish-header" width="32%">
<th class="table-cyanish-header" width="40%">
medewerker
</th>
<th class="table-cyanish-header" width="15%">
@@ -22,9 +22,9 @@
<th class="table-cyanish-header align-right" width="15%">
omzet
</th>
<th class="table-cyanish-header" width="8%">
&nbsp;
</th>
<!-- <th class="table-cyanish-header" width="8%">-->
<!-- &nbsp;-->
<!-- </th>-->
</thead>
<tbody data-bind="foreach:projecthours">
<tr>
@@ -69,11 +69,11 @@
<i class="icon fa-euro"></i>
<span data-bind="text:dbo.helpers.numberWithPoints(revenue())"></span>
</td>
<td>
<i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProjecthour"></i>
<i class="icon fa-trash redish pointer" title="verwijder"
data-bind="click:$root.removeProjecthour"></i>
</td>
<!-- <td>-->
<!-- <i class="icon fa-edit pointer" title="wijzig" data-bind="click:$root.editProjecthour"></i>-->
<!-- <i class="icon fa-trash redish pointer" title="verwijder"-->
<!-- data-bind="click:$root.removeProjecthour"></i>-->
<!-- </td>-->
</tr>
</tbody>
<tfoot>
@@ -87,15 +87,15 @@
<i class="icon fa-euro"></i>
<span data-bind="text:dbo.helpers.numberWithPoints(totalRevenue())"></span>
</th>
<th class="table-cyanish-header">&nbsp;</th>
</tr>
<tr>
<td colspan="5">
<button class="btn btn-primary btn-round btn-sm" data-bind="click:newProjecthour">
nieuwe uren
</button>
</td>
<!-- <th class="table-cyanish-header">&nbsp;</th>-->
</tr>
<!-- <tr>-->
<!-- <td colspan="5">-->
<!-- <button class="btn btn-primary btn-round btn-sm" data-bind="click:newProjecthour">-->
<!-- nieuwe uren-->
<!-- </button>-->
<!-- </td>-->
<!-- </tr>-->
</tfoot>
</table>
</div>
+21 -14
View File
@@ -4,23 +4,30 @@
<table class="table table-condensed">
<thead>
<tr>
<th>rol</th>
<!-- ko foreach:roles -->
<th>
<span data-bind="text:rolename"></span>
</th>
<!-- /ko -->
<th>
pagina
</th>
<th v-for="(role, roleIndex) in roles" align="center">
<span>{{ role.rolename }}</span>
</th>
</tr>
</thead>
<tbody>
<td>
<span data-bind="text:pagename"></span>
</td>
<!-- ko foreach:roles -->
<th>
<span data-bind="text:rolename"></span>
</th>
<!-- /ko -->
<tr v-for="(page, pageIndex) in pages">
<td>
<span v-bind:class="{'main-menu': page.typePage == 'MAIN', 'sub-page': page.typePage != 'MAIN'}" >
{{ page.pagename }}
</span>
</td>
<td v-for="(accessPage, roleIndex) in page.accessPages" align="center">
<i v-if="accessPage.access"
v-on:click="toggleAccess(pageIndex, roleIndex)"
class="icon fa-check pointer"></i>
<i v-if="! accessPage.access"
v-on:click="toggleAccess(pageIndex, roleIndex)"
class="icon fa-square-o pointer"></i>
</td>
</tr>
</tbody>
</table>
</div>
+42 -6
View File
@@ -42,18 +42,52 @@
<img class="brand-img" src="css/images/logo_dbo.png" alt="...">
<h2 class="brand-text font-size-18">projectbeheer</h2>
</div>
<div>
<div data-bind="visible: !showPasswordRequest()">
<div>
<div class="form-group form-material floating" data-plugin="formMaterial">
<input type="text" class="form-control" name="gebruikersnaam"
data-bind="textInput:username" />
<label class="floating-label">gebruikersnaam</label>
</div>
<div class="form-group form-material floating" data-plugin="formMaterial">
<input type="password" class="form-control" name="password"
data-bind="textInput:password" />
<label class="floating-label">wachtwoord</label>
</div>
<button type="button"
class="btn btn-primary btn-block btn-lg mt-40"
data-bind="click:login">Log in</button>
</div>
<div>
<br />
<a href="#" data-bind="click:togglePasswordrequest">wachtwoord vergeten?</a>
</div>
</div>
<div data-bind="visible: showPasswordRequest()">
<p>
Vul hieronder uw emailadres en gebruikersnaam in, u krijgt dan een mail met een nieuw wachtwoord toegezonden!
</p>
<div class="form-group form-material floating" data-plugin="formMaterial">
<input type="text" class="form-control" name="email"
<input type="text"
class="form-control"
name="gebruikersnaam"
data-bind="textInput:username" />
<label class="floating-label">gebruikersnaam</label>
</div>
<div class="form-group form-material floating" data-plugin="formMaterial">
<input type="password" class="form-control" name="password"
data-bind="textInput:password" />
<label class="floating-label">wachtwoord</label>
<input type="text"
class="form-control"
name="password"
data-bind="textInput:email" />
<label class="floating-label">emailadres</label>
</div>
<button type="button"
class="btn btn-primary btn-block btn-lg mt-40"
data-bind="click:requestPassword">vraag aan</button>
<div>
<br />
<a href="#" data-bind="click:togglePasswordrequest">terug naar inlog?</a>
</div>
<button type="button" class="btn btn-primary btn-block btn-lg mt-40" data-bind="click:login">Log in</button>
</div>
</div>
</div>
@@ -108,5 +142,7 @@
<script src="js/vendor/Knockout.min.js"></script>
<script src="js/lib/modules/login/loginModule.js"></script>
<script src="js/lib/modules/specials/tellmeModule.js"></script>
<script src="js/lib/helpers.js"></script>
</body>
</html>
@@ -1,13 +1,13 @@
<div class="MONTHLYEMPLOYEEHOURS">
<div class="row">
<div class="col-md-1">
<label>jaar</label>
</div>
<div class="col-md-2">
<input type="text" class="form-control" data-bind="textInput:selectedYear, event:{keyup:checkYear}" >
<div class="invalid-feedback" data-bind="visible: ! validYear()">geen geldig jaar</div>
</div>
</div>
<!-- <div class="row">-->
<!-- <div class="col-md-1">-->
<!-- <label>jaar</label>-->
<!-- </div>-->
<!-- <div class="col-md-2">-->
<!-- <input type="text" class="form-control" data-bind="textInput:selectedYear, event:{keyup:checkYear}" >-->
<!-- <div class="invalid-feedback" data-bind="visible: ! validYear()">geen geldig jaar</div>-->
<!-- </div>-->
<!-- </div>-->
<div class="row">
<div class="col-md-12">
<div class="nav-tabs-horizontal">
+10 -2
View File
@@ -13,6 +13,14 @@
<script src="js/vendor/froala/js/froala_editor.min.js"></script>
<script src="js/vendor/froala/js/plugins/knockout-froala.js"></script>
<?php if($_ENV['ENVIRONMENT'] == 'development'): ?>
<script src="js/vendor/vue.js"></script>
<?php else: ?>
<script src="js/vendor/vue.min.js"></script>
<?php endif; ?>
<script src="js/vendor/Chart.js"></script>
<script src="js/vendor/lodash.js"></script>
@@ -29,7 +37,8 @@
<script src="js/lib/modules/beheer/customersModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/beheer/externalsModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/beheer/vatModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/beheer/authorisationModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/dataservices/authorisationDataService.js"></script>
<script src="js/lib/modules/beheer/authorisationVue.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/projects/offersModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/projects/projectsModule.js?version=<?= $this->version ?>"></script>
<script src="js/lib/modules/projects/employeehoursModule.js?version=<?= $this->version ?>"></script>
@@ -68,7 +77,6 @@
<script src="js/lib/dataservices/invoiceDataService.js"></script>
<script src="js/lib/dataservices/reservationsDataService.js"></script>
<script src="js/lib/dataservices/employeeTargetDataService.js"></script>
<script src="js/lib/dataservices/authorisationDataService.js"></script>
<script src="js/lib/services/chartService.js"></script>
+2 -1
View File
@@ -18,7 +18,8 @@
</a>
<ul class="collapse list-unstyled" id="<?= $page->pageurl ?>">
<?php foreach ( $page->subpages as $subpage ): ?>
<li data-bind="click:setPage.bind($data, '<?= $subpage->pageurl ?>')">
<li data-bind="click:setPage.bind($data, '<?= $subpage->pageurl ?>'),
css:{'selected-page':<?= $subpage->pageurl ?>()}">
<a href="#"><?= $subpage->pagename ?></a>
</li>
<?php endforeach; ?>
@@ -40,7 +40,7 @@
<div><span>Lopend boekjaar</span></div>
</th>
<th class="rotate">
<div><span>Volgend boekjaar</span></div>
<div><span>Volgende boekjaren</span></div>
</th>
</tr>
</thead>