Skip to content

Commit 2eda3ed

Browse files
modularcodermodularcoder
committed
Updates
1 parent ce45ec2 commit 2eda3ed

File tree

10 files changed

+1546
-1546
lines changed

10 files changed

+1546
-1546
lines changed

‎css/app-blue.css

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

‎css/app-custom.css

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

‎css/app-green.css

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

‎css/app-orange.css

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

‎css/app-purple.css

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

‎css/app-red.css

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

‎css/app-seagreen.css

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

‎css/app.css

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

‎js/app.js

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -156,24 +156,28 @@ $(function() {
156156
$el.addClass('visible');
157157
}, 1000);
158158
})
159-
//ResetForm validation
159+
//LoginForm validation
160160
$(function() {
161-
if (!$('#reset-form').length) {
161+
if (!$('#login-form').length) {
162162
return false;
163163
}
164164

165-
var resetValidationSettings = {
165+
var loginValidationSettings = {
166166
rules: {
167-
email1: {
167+
username: {
168168
required: true,
169169
email: true
170-
}
170+
},
171+
password: "required",
172+
agree: "required"
171173
},
172174
messages: {
173-
email1: {
174-
required: "Please enter email address",
175+
username: {
176+
required: "Please enter username",
175177
email: "Please enter a valid email address"
176-
}
178+
},
179+
password: "Please enter password",
180+
agree: "Please accept our policy"
177181
},
178182
invalidHandler: function() {
179183
animate({
@@ -183,32 +187,28 @@ $(function() {
183187
}
184188
}
185189

186-
$.extend(resetValidationSettings, config.validations);
190+
$.extend(loginValidationSettings, config.validations);
187191

188-
$('#reset-form').validate(resetValidationSettings);
192+
$('#login-form').validate(loginValidationSettings);
189193
})
190-
//LoginForm validation
194+
//ResetForm validation
191195
$(function() {
192-
if (!$('#login-form').length) {
196+
if (!$('#reset-form').length) {
193197
return false;
194198
}
195199

196-
var loginValidationSettings = {
200+
var resetValidationSettings = {
197201
rules: {
198-
username: {
202+
email1: {
199203
required: true,
200204
email: true
201-
},
202-
password: "required",
203-
agree: "required"
205+
}
204206
},
205207
messages: {
206-
username: {
207-
required: "Please enter username",
208+
email1: {
209+
required: "Please enter email address",
208210
email: "Please enter a valid email address"
209-
},
210-
password: "Please enter password",
211-
agree: "Please accept our policy"
211+
}
212212
},
213213
invalidHandler: function() {
214214
animate({
@@ -218,9 +218,9 @@ $(function() {
218218
}
219219
}
220220

221-
$.extend(loginValidationSettings, config.validations);
221+
$.extend(resetValidationSettings, config.validations);
222222

223-
$('#login-form').validate(loginValidationSettings);
223+
$('#reset-form').validate(resetValidationSettings);
224224
})
225225
//SignupForm validation
226226
$(function() {
@@ -984,6 +984,43 @@ $(function() {
984984

985985

986986

987+
$(function() {
988+
989+
var $dashboardSalesBreakdownChart = $('#dashboard-sales-breakdown-chart');
990+
991+
if (!$dashboardSalesBreakdownChart.length) {
992+
return false;
993+
}
994+
995+
function drawSalesChart(){
996+
997+
$dashboardSalesBreakdownChart.empty();
998+
999+
Morris.Donut({
1000+
element: 'dashboard-sales-breakdown-chart',
1001+
data: [{ label: "Download Sales", value: 12 },
1002+
{ label: "In-Store Sales", value: 30 },
1003+
{ label: "Mail-Order Sales", value: 20 } ],
1004+
resize: true,
1005+
colors: [
1006+
tinycolor(config.chart.colorPrimary.toString()).lighten(10).toString(),
1007+
tinycolor(config.chart.colorPrimary.toString()).darken(8).toString(),
1008+
config.chart.colorPrimary.toString()
1009+
],
1010+
});
1011+
1012+
var $sameheightContainer = $dashboardSalesBreakdownChart.closest(".sameheight-container");
1013+
1014+
setSameHeights($sameheightContainer);
1015+
}
1016+
1017+
drawSalesChart();
1018+
1019+
$(document).on("themechange", function(){
1020+
drawSalesChart();
1021+
});
1022+
1023+
})
9871024
$(function() {
9881025

9891026

@@ -1025,43 +1062,6 @@ $(function() {
10251062
drawDashboardItemsListSparklines();
10261063
});
10271064
});
1028-
$(function() {
1029-
1030-
var $dashboardSalesBreakdownChart = $('#dashboard-sales-breakdown-chart');
1031-
1032-
if (!$dashboardSalesBreakdownChart.length) {
1033-
return false;
1034-
}
1035-
1036-
function drawSalesChart(){
1037-
1038-
$dashboardSalesBreakdownChart.empty();
1039-
1040-
Morris.Donut({
1041-
element: 'dashboard-sales-breakdown-chart',
1042-
data: [{ label: "Download Sales", value: 12 },
1043-
{ label: "In-Store Sales", value: 30 },
1044-
{ label: "Mail-Order Sales", value: 20 } ],
1045-
resize: true,
1046-
colors: [
1047-
tinycolor(config.chart.colorPrimary.toString()).lighten(10).toString(),
1048-
tinycolor(config.chart.colorPrimary.toString()).darken(8).toString(),
1049-
config.chart.colorPrimary.toString()
1050-
],
1051-
});
1052-
1053-
var $sameheightContainer = $dashboardSalesBreakdownChart.closest(".sameheight-container");
1054-
1055-
setSameHeights($sameheightContainer);
1056-
}
1057-
1058-
drawSalesChart();
1059-
1060-
$(document).on("themechange", function(){
1061-
drawSalesChart();
1062-
});
1063-
1064-
})
10651065
$(function() {
10661066

10671067
var $dashboardSalesMap = $('#dashboard-sales-map');

‎screenful.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -434,15 +434,15 @@ <h3 class="subtitle">This project is proudly supported by</h3>
434434
<h3 class="integrations-title">Visual dashboards and team status reports</h3>
435435
<div class="integrations-tools">
436436
<a href="https://screenful.com/dashboard-for-trello/?utm_source=modularadmin&utm_campaign=modularadmin" class="integration-item">
437-
<img class="integration-logo" title="Instant visual dashboards for Trello" alt="Instant visual dashboards for Trello" src='modular-admin-html/assets/screenful/integration-trello.png'> </a>
437+
<img class="integration-logo" title="Instant visual dashboards for Trello" alt="Instant visual dashboards for Trello" src='/modular-admin-html/assets/screenful/integration-trello.png'> </a>
438438
<a href="https://screenful.com/dashboard-for-jira/?utm_source=modularadmin&utm_campaign=modularadmin" class="integration-item">
439-
<img class="integration-logo" title="Instant visual dashboards for JIRA" alt="Instant visual dashboards for JIRA" src='modular-admin-html/assets/screenful/integration-jira.png'> </a>
439+
<img class="integration-logo" title="Instant visual dashboards for JIRA" alt="Instant visual dashboards for JIRA" src='/modular-admin-html/assets/screenful/integration-jira.png'> </a>
440440
<a href="https://screenful.com/dashboard-for-github/?utm_source=modularadmin&utm_campaign=modularadmin" class="integration-item">
441-
<img class="integration-logo" title="Instant visual dashboards for GitHub issues" alt="Instant visual dashboards for GitHub issues" src='modular-admin-html/assets/screenful/integration-github.png'> </a>
441+
<img class="integration-logo" title="Instant visual dashboards for GitHub issues" alt="Instant visual dashboards for GitHub issues" src='/modular-admin-html/assets/screenful/integration-github.png'> </a>
442442
<a href="https://screenful.com/dashboard-for-pivotal-tracker/?utm_source=modularadmin&utm_campaign=modularadmin" class="integration-item">
443-
<img class="integration-logo" title="Instant visual dashboards for Pivotal Tracker" alt="Instant visual dashboards for Pivotal Tracker" src='modular-admin-html/assets/screenful/integration-pivotal.png'> </a>
443+
<img class="integration-logo" title="Instant visual dashboards for Pivotal Tracker" alt="Instant visual dashboards for Pivotal Tracker" src='/modular-admin-html/assets/screenful/integration-pivotal.png'> </a>
444444
<a href="https://screenful.com/dashboard-for-asana/?utm_source=modularadmin&utm_campaign=modularadmin" class="integration-item">
445-
<img class="integration-logo" title="Instant visual dashboards for Asana" alt="Instant visual dashboards for Asana" src='modular-admin-html/assets/screenful/integration-asana.png'> </a>
445+
<img class="integration-logo" title="Instant visual dashboards for Asana" alt="Instant visual dashboards for Asana" src='/modular-admin-html/assets/screenful/integration-asana.png'> </a>
446446
</div>
447447
<h6 class="subtitle">Click the logo to learn how it works with your tool of choice!</h6>
448448
</div>
@@ -452,7 +452,7 @@ <h3 class="benefits-title">Make better decisions based on facts</h3>
452452
<div class="col-md-6 screen-colum">
453453
<div class="screen-item">
454454
<a href="https://screenful.com/tour/timing-screen/?utm_source=modularadmin&utm_campaign=modularadmin">
455-
<img class="ex-pic" alt="Timing Screen" title="Timing Screen" src='modular-admin-html/assets/screenful/screen-timing.png'> </a>
455+
<img class="ex-pic" alt="Timing Screen" title="Timing Screen" src='/modular-admin-html/assets/screenful/screen-timing.png'> </a>
456456
<div class="description">
457457
<a href="https://screenful.com/tour/timing-screen/?utm_source=modularadmin&utm_campaign=modularadmin">
458458
<h3 class="title">Track your lead and cycle times</h3>
@@ -468,7 +468,7 @@ <h3 class="title">Track your lead and cycle times</h3>
468468
<div class="col-md-6 screen-colum">
469469
<div class="screen-item">
470470
<a href="https://screenful.com/tour/sprint-burndown-chart/?utm_source=modularadmin&utm_campaign=modularadmin">
471-
<img class="ex-pic" alt="Sprint Burndown" title="Sprint Burndown" src='modular-admin-html/assets/screenful/screen-sprint.png'> </a>
471+
<img class="ex-pic" alt="Sprint Burndown" title="Sprint Burndown" src='/modular-admin-html/assets/screenful/screen-sprint.png'> </a>
472472
<div class="description">
473473
<a href="https://screenful.com/tour/sprint-burndown-chart/?utm_source=modularadmin&utm_campaign=modularadmin">
474474
<h3 class="title">Track your sprint progress with a burndown chart</h3>
@@ -485,7 +485,7 @@ <h3 class="title">Track your sprint progress with a burndown chart</h3>
485485
<div class="col-md-6 screen-colum">
486486
<div class="screen-item">
487487
<a href="https://screenful.com/tour/milestone-burnup-chart/?utm_source=modularadmin&utm_campaign=modularadmin">
488-
<img class="ex-pic" alt="Milestone Burnup Chart" title="Milestone Burnup Chart" src='modular-admin-html/assets/screenful/screen-milestone.png'> </a>
488+
<img class="ex-pic" alt="Milestone Burnup Chart" title="Milestone Burnup Chart" src='/modular-admin-html/assets/screenful/screen-milestone.png'> </a>
489489
<div class="description">
490490
<a href="https://screenful.com/tour/milestone-burnup-chart/?utm_source=modularadmin&utm_campaign=modularadmin">
491491
<h3 class="title">Monitor the progress of your milestones</h3>
@@ -501,7 +501,7 @@ <h3 class="title">Monitor the progress of your milestones</h3>
501501
<div class="col-md-6 screen-colum">
502502
<div class="screen-item">
503503
<a href="https://screenful.com/tour/task-status-screen/?utm_source=modularadmin&utm_campaign=modularadmin">
504-
<img class="ex-pic" alt="Task Status" title="Task Status" src='modular-admin-html/assets/screenful/screen-task-status.png'> </a>
504+
<img class="ex-pic" alt="Task Status" title="Task Status" src='/modular-admin-html/assets/screenful/screen-task-status.png'> </a>
505505
<div class="description">
506506
<a href="https://screenful.com/tour/task-status-screen/?utm_source=modularadmin&utm_campaign=modularadmin">
507507
<h3 class="title">Gain a bird's-eye view on your projects</h3>
@@ -518,7 +518,7 @@ <h3 class="title">Gain a bird's-eye view on your projects</h3>
518518
<div class="col-md-6 screen-colum">
519519
<div class="screen-item">
520520
<a href="https://screenful.com/tour/open-tasks-chart/?utm_source=modularadmin&utm_campaign=modularadmin">
521-
<img class="ex-pic" alt="Open Tasks chart" title="Open Tasks chart" src='modular-admin-html/assets/screenful/screen-open-tasks.png'> </a>
521+
<img class="ex-pic" alt="Open Tasks chart" title="Open Tasks chart" src='/modular-admin-html/assets/screenful/screen-open-tasks.png'> </a>
522522
<div class="description">
523523
<a href="https://screenful.com/tour/open-tasks-chart/?utm_source=modularadmin&utm_campaign=modularadmin">
524524
<h3 class="title">Track your work in progress</h3>
@@ -534,7 +534,7 @@ <h3 class="title">Track your work in progress</h3>
534534
<div class="col-md-6 screen-colum">
535535
<div class="screen-item">
536536
<a href="https://screenful.com/tour/completed-tasks-chart/?utm_source=modularadmin&utm_campaign=modularadmin">
537-
<img class="ex-pic" alt="Completed Tasks chart" title="Completed Tasks chart" src='modular-admin-html/assets/screenful/screen-completed-tasks.png'> </a>
537+
<img class="ex-pic" alt="Completed Tasks chart" title="Completed Tasks chart" src='/modular-admin-html/assets/screenful/screen-completed-tasks.png'> </a>
538538
<div class="description">
539539
<a href="https://screenful.com/tour/completed-tasks-chart/?utm_source=modularadmin&utm_campaign=modularadmin">
540540
<h3 class="title">Track your completed work</h3>
@@ -550,7 +550,7 @@ <h3 class="title">Track your completed work</h3>
550550
<div class="col-md-6 screen-colum">
551551
<div class="screen-item">
552552
<a href="https://screenful.com/tour/team-status-screen/?utm_source=modularadmin&utm_campaign=modularadmin">
553-
<img class="ex-pic" alt="Team Status screen" title="Team Status screen" src='modular-admin-html/assets/screenful/screen-team-status.png'> </a>
553+
<img class="ex-pic" alt="Team Status screen" title="Team Status screen" src='/modular-admin-html/assets/screenful/screen-team-status.png'> </a>
554554
<div class="description">
555555
<a href="https://screenful.com/tour/team-status-screen/?utm_source=modularadmin&utm_campaign=modularadmin">
556556
<h3 class="title">See what each team member is currently working on</h3>
@@ -567,7 +567,7 @@ <h3 class="title">See what each team member is currently working on</h3>
567567
<div class="col-md-6 screen-colum">
568568
<div class="screen-item">
569569
<a href="https://screenful.com/blog/introducing-custom-chart-create-any-chart-from-your-task-data/?utm_source=modularadmin&utm_campaign=modularadmin">
570-
<img class="ex-pic" alt="Custom Chart" title="Custom Chart" src='modular-admin-html/assets/screenful/screen-custom-chart.png'> </a>
570+
<img class="ex-pic" alt="Custom Chart" title="Custom Chart" src='/modular-admin-html/assets/screenful/screen-custom-chart.png'> </a>
571571
<div class="description">
572572
<a href="https://screenful.com/blog/introducing-custom-chart-create-any-chart-from-your-task-data/?utm_source=modularadmin&utm_campaign=modularadmin">
573573
<h3 class="title">Create custom charts</h3>

0 commit comments

Comments
 (0)