Merge branch 'framework' into dev

3 files changed, 59 insertions, 0 deletions

diff --git a/app/view/master/foot.view.php b/app/view/master/foot.view.php
new file mode 100644
index 0000000..6220f89
--- /dev/null
+++ b/app/view/master/foot.view.php
@@ -0,0 +1,10 @@
+<script type="text/javascript" src="<?=$mod->ar()?>/assets/js/jquery.min.js"></script>
+<script type="text/javascript" src="<?=$mod->ar()?>/assets/js/bootstrap.min.js"></script>
+
+<?php if ($mod->isError() || $mod->isWarning() || $mod->isNotice()) { ?>
+    <script type="text/javascript">
+        $(window).load(function() {
+            $("#noticeModal").modal("show");
+        });
+    </script>
+<?php } ?>
diff --git a/app/view/master/head.view.php b/app/view/master/head.view.php
new file mode 100644
index 0000000..54294b8
--- /dev/null
+++ b/app/view/master/head.view.php
@@ -0,0 +1,5 @@
+<meta charset="utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+
+<link rel="stylesheet" type="text/css" href="<?=$mod->ar()?>/assets/css/bootstrap.min.css" />
diff --git a/app/view/master/topp.view.php b/app/view/master/topp.view.php
new file mode 100644
index 0000000..fe430ff
--- /dev/null
+++ b/app/view/master/topp.view.php
@@ -0,0 +1,44 @@
+<?php if ($mod->isError() || $mod->isWarning() || $mod->isNotice()) { ?>
+    <div id="noticeModal" class="modal fade" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+
+                <div class="modal-body alert <?=$mod->getNoticeModalAlertClass()?>" style="margin: 0;">
+                    <h1 class="text-center"><span class="<?=$mod->getNoticeModalGlyphicon()?>"></span></h1>
+                    <h5 class="text-center">Something Happened</h5>
+
+                    <?php if ($mod->isError()) { ?>
+                        <p>
+                            <?php foreach ($mod->errorlist as $err) { ?>
+                                <span class="label label-danger">Error</span> <?=$err?><br />
+                            <?php } ?>
+                        </p>
+                    <?php } ?>
+
+                    <?php if ($mod->isWarning()) { ?>
+                        <p>
+                            <?php foreach ($mod->warninglist as $warn) { ?>
+                                <span class="label label-warning">Warning</span> <?=$warn?><br />
+                            <?php } ?>
+                        </p>
+                    <?php } ?>
+
+                    <?php if ($mod->isNotice()) { ?>
+                        <p>
+                            <?php foreach ($mod->noticelist as $note) { ?>
+                                <span class="label label-info">Notice</span> <?=$note?><br />
+                            <?php } ?>
+                        </p>
+                    <?php } ?>
+
+                    <div class="text-center">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">
+                            <span class="glyphicon glyphicon-ok"></span> Got it
+                        </button>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+<?php } ?>