From e9680d03c1a97981855fa4690e01be0733d933dc Mon Sep 17 00:00:00 2001 From: M Date: Sun, 22 Nov 2015 13:26:48 -0500 Subject: + Added view for Master MVC --- app/view/master/head.view.php | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/view/master/head.view.php (limited to 'app/view') diff --git a/app/view/master/head.view.php b/app/view/master/head.view.php new file mode 100644 index 0000000..0c9178f --- /dev/null +++ b/app/view/master/head.view.php @@ -0,0 +1,5 @@ + + + + + -- cgit v1.2.3 From 45b1481e4d3a8ce5d92fee955468616588bb51f0 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 22 Nov 2015 16:57:16 -0500 Subject: + Added footer view to Master MVC (for placing JS includes at the bottom of pages) --- app/view/master/foot.view.php | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/view/master/foot.view.php (limited to 'app/view') diff --git a/app/view/master/foot.view.php b/app/view/master/foot.view.php new file mode 100644 index 0000000..5c52563 --- /dev/null +++ b/app/view/master/foot.view.php @@ -0,0 +1,2 @@ + + -- cgit v1.2.3 From ff1cc22306565f8c7d2629882a38f1d462694edd Mon Sep 17 00:00:00 2001 From: M Date: Sun, 22 Nov 2015 21:40:35 -0500 Subject: + Adding draft of the sysconf view --- app/view/sysconf/default.view.php | 107 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 app/view/sysconf/default.view.php (limited to 'app/view') diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php new file mode 100644 index 0000000..74dfd79 --- /dev/null +++ b/app/view/sysconf/default.view.php @@ -0,0 +1,107 @@ + + + + + + Scrott - System-level configuration missing + + + + + + + + +

+

+

+ + + + + + +

+ +

Welcome to Scrott!

+

+ +

You're seeing this page because the file "scrott.conf.php" is missing.
Please fill out the form below to create a config automatically!

+

Click the icons above to learn more about core Scrott features and constructs!

+

+ +

This form will initialize Scrott's system-level configuration.
These are things the app needs before it can begin functioning at all!

+

It is presumed that you are the administrator for this Scrott install.
There is a security risk involved with exposing this page to the public!

+ +

+

+ +

+

+

+ +

+

+

+ +

+

+

+

+ + + + + -- cgit v1.2.3 From 7de4383f0d7e5b3db8eb69e34795dec251ae842e Mon Sep 17 00:00:00 2001 From: M Date: Sun, 29 Nov 2015 17:33:50 -0500 Subject: * Moved sysconf default view modal content out to diffent view file --- app/view/sysconf/default.view.php | 23 +++-------------------- app/view/sysconf/user.modal.view.php | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 app/view/sysconf/user.modal.view.php (limited to 'app/view') diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index 74dfd79..a4dade9 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -19,29 +19,12 @@ - - - +

+     +             diff --git a/app/view/sysconf/user.modal.view.php b/app/view/sysconf/user.modal.view.php new file mode 100644 index 0000000..b3650b0 --- /dev/null +++ b/app/view/sysconf/user.modal.view.php @@ -0,0 +1,30 @@ +
+
+
+
+ + + +
User Accounts
+ +
+ +
+
Scrott implements a very flexible permissions and access-control system. It all + starts with users' accounts. Users can create and maintain objects and share them + with other users if they choose. This is done with a mechanism similar to unix + file permission modes. Scrott objects form a hierarchy, so permissions from 'higher' + objects will cascade down. This means that a non-trusted user may control an issue + in your pad, but have no access to the pad itself.
+
+ +
+ +
+
+
+
-- cgit v1.2.3 From 32569e09783e442415f76e0b54b20f084843b120 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 29 Nov 2015 17:56:48 -0500 Subject: + Created sysconf group modal --- app/view/sysconf/default.view.php | 5 ++--- app/view/sysconf/group.modal.view.php | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 app/view/sysconf/group.modal.view.php (limited to 'app/view') diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index a4dade9..7febbf6 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -20,13 +20,12 @@ +

    - -     -     +                 diff --git a/app/view/sysconf/group.modal.view.php b/app/view/sysconf/group.modal.view.php new file mode 100644 index 0000000..cd05642 --- /dev/null +++ b/app/view/sysconf/group.modal.view.php @@ -0,0 +1,31 @@ +
+
+
+
+ + + +
User Groups
+ +
+ +
+
Groups make sharing objects and collaborating easier. Instead of creating your + own pad and adding each of your team members to it individualy, create a + group-owned pad. With the appropriate permissions set, all group members will be + able to use the pad. This also solves issues where a shared pad is owned by a + single user whose account gets closed. Instead pads and other objects are safe as + long as the group exists. Groups are owned and managed by a single user, who must + stick around or transfer ownership for the group to continue functioning.
+
+ +
+ +
+
+
+
-- cgit v1.2.3 From b4af0b4594a95365f77575eef288a5d318f5a06c Mon Sep 17 00:00:00 2001 From: M Date: Sun, 29 Nov 2015 19:16:06 -0500 Subject: + Added sysconf pad modal view --- app/view/sysconf/pad.modal.view.php | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 app/view/sysconf/pad.modal.view.php (limited to 'app/view') diff --git a/app/view/sysconf/pad.modal.view.php b/app/view/sysconf/pad.modal.view.php new file mode 100644 index 0000000..88c62e7 --- /dev/null +++ b/app/view/sysconf/pad.modal.view.php @@ -0,0 +1,50 @@ +
+
+
+
+ + + +
Pads
+ +
+ +
+
Use pads to track tasks, issues, bugs, client tickets, etc. Within Scrott, these + are collectively referred to as 'issues'. Use a pad to track your progress on a + project's completion, to manage user issues for a help-desk, to keep a shopping list, + bucket list, lists to track your progress on a television series (or series you'd + like to start), or books to read, or anything inbetween.
+ +
In addition to issue tracking, pads enable users to communicate with one another. + Each pad consists of a lightweight message board (forum) and users can also post + messages directly to issues if they are relevant. With email integration, even + non-scrott users may be clued in to the progress of their open issues. Pads even + allow for message threads to be converted (elevated) to a new open issue if need be. + (for example: Imagine you started a thread to discuss a potential new website design. + Once your team had arrived at something the majority liked, the thread can be elevated + to a new issue (preserving all messaging history), assigned to one of the team + members, and tracked just like all of your other issues.)
+ +
If you would like to allow the public to open issues in your pad (ie: if your pad + is allowing bug reports/feature requests from users of your project or if your pad + is the issue tracker for a help-desk), you can enable an issue portal for your pad. + A portal is a page accessible to the public where anonymous internet users (with a + verified email address) may submit new issues to your pad. Their email address + becomes the issue owner so the requester is still able to receive updates on the + issue as well as respond with their own messages.
+ +
Pads can be used by a single user or many; and pads can be owned by a user or a + user group
+
+ +
+ +
+
+
+
-- cgit v1.2.3 From d0ac4b2ef6ac4bb472188a84085ab040e5b2a769 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 29 Nov 2015 20:03:50 -0500 Subject: + Added sysconf stage modal view --- app/view/sysconf/stage.modal.view.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 app/view/sysconf/stage.modal.view.php (limited to 'app/view') diff --git a/app/view/sysconf/stage.modal.view.php b/app/view/sysconf/stage.modal.view.php new file mode 100644 index 0000000..4eaab43 --- /dev/null +++ b/app/view/sysconf/stage.modal.view.php @@ -0,0 +1,34 @@ +
+
+
+
+ + + +
Pad Stages
+ +
+ +
+
The issue-tracking aspect of pads is divided up using pad stages. A stage is + representative of the level of completion or high-level status of an issue. For + example, a pad may have an initial stage named "To Do", an intermediate stage named + "In Progress", and another stage "In Review". Stages form a sequence in practice. + When the appropriate amount of work has been done on an issue, it is advanced to the + next stage in the pipeline. This allows other pad members and the issue's owner to + at a glance get an idea of the high-level progress of the issue.
+ +
Once an issue is closed, it is removed from this stage pipeline, but retained in + the pad itself for archival purposes and for generating reports.
+
+ +
+ +
+
+
+
-- cgit v1.2.3 From fd415e6d1054795f8643e909061f7cd0cd5c5318 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 29 Nov 2015 20:29:37 -0500 Subject: + Added sysconf issue modal view --- app/view/sysconf/issue.modal.view.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 app/view/sysconf/issue.modal.view.php (limited to 'app/view') diff --git a/app/view/sysconf/issue.modal.view.php b/app/view/sysconf/issue.modal.view.php new file mode 100644 index 0000000..a77c1e3 --- /dev/null +++ b/app/view/sysconf/issue.modal.view.php @@ -0,0 +1,34 @@ +
+
+
+
+ + + +
Issues
+ +
+ +
+
Issues represent work. This work could be anything from a software project's bug + needing fixed or a new feature to implement to a record of needing to order more + celing panels for the new home office build. Work is done by someone, for someone, + and this is reflected in Scrott's internal data structures. Every issues has a + distinct owner (someone requesting work be done) and assignee (someone who needs to + do the work). If others are interested in the work or have valuable input on the + work, they may be included (cc'd) on the issue to receive updates on it or to be able + to post their own updates. Scrott tracks issues using pads which are representative + of a high-level project or some similar effort. So related issues are tracked + together.
+
+ +
+ +
+
+
+
-- cgit v1.2.3 From bd78037bb26a2c325d4dc25ae4d5bc11738c9838 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 29 Nov 2015 21:39:48 -0500 Subject: + Adding sysconf message modal view --- app/view/sysconf/message.modal.view.php | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 app/view/sysconf/message.modal.view.php (limited to 'app/view') diff --git a/app/view/sysconf/message.modal.view.php b/app/view/sysconf/message.modal.view.php new file mode 100644 index 0000000..715bb06 --- /dev/null +++ b/app/view/sysconf/message.modal.view.php @@ -0,0 +1,37 @@ +
+
+
+
+ + + +
Messages
+ +
+ +
+
Although Scrott is formost an issue-tracking tool, it can also be a useful + communication tool for team and client relationships. Scrott includes a lightweight + messaging system that is aparent:
+
+
In pads: where users can start new general discussion threads and post + replys
+
In issues: where users can post comments or updates on work status
+
In general: where users can send other users direct private messages
+
+
With email integration, Scrott also allows communication with non-scrott user + clients or owners of issues.
+
Scrott's built-in logging system utilizes this messaging framework and is used + by object owners and site administrators to monitor usage and activity on Scrott
+
+ +
+ +
+
+
+
-- cgit v1.2.3 From b6883568aa378fc27a0d561f31945fc7d44a4df3 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 29 Nov 2015 22:08:59 -0500 Subject: * Updated sysconf default view to include new modal content --- app/view/sysconf/default.view.php | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'app/view') diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index 7febbf6..83fa145 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -6,30 +6,27 @@ Scrott - System-level configuration missing + + + +

        -     -     -     - +     +     +     +

Welcome to Scrott!
-- cgit v1.2.3 From b0ab1bc56182514d0cb39febf1792f2c63819d49 Mon Sep 17 00:00:00 2001 From: M Date: Wed, 2 Dec 2015 22:43:22 -0500 Subject: * Formatted DB portion of the sysconf page form --- app/view/sysconf/default.view.php | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'app/view') diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index 83fa145..4266ab8 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -18,6 +18,7 @@ +

@@ -47,23 +48,30 @@

Database Connection +
-
- - localhost - -
+ Engine +
+
+ Server Address + +
+
+ Database Name + +
+
+ Username + +
- -
- DB Name -
- -
+
+ Password +

@@ -76,11 +84,5 @@
- -- cgit v1.2.3 From cc6c04725504d7419513c6a023bd51c02a6de8a4 Mon Sep 17 00:00:00 2001 From: M Date: Thu, 3 Dec 2015 21:00:34 -0500 Subject: * Finished form for sysconf default view --- app/view/sysconf/default.view.php | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'app/view') diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index 4266ab8..f6b5b23 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -48,7 +48,6 @@

Database Connection -
Engine @@ -73,6 +72,40 @@ Password
+ + Application Installation +
+ Install Location + +
Detected from location of files in web document root
+
+ + Settings +
+ HTTP(S) +
+ + + Always Force SSL + +
+ +
+ + + Neither (Application can override) + +
+ +
+ + + Always Forbid SSL + +
+
+ +

-- cgit v1.2.3 From dfd10529bb00ed344cb118219abab98cb1769760 Mon Sep 17 00:00:00 2001 From: M Date: Thu, 3 Dec 2015 21:12:02 -0500 Subject: * Fixed the sources in the master head and foot views (wasn't accounting for app-root) --- app/view/master/foot.view.php | 4 ++-- app/view/master/head.view.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/view') diff --git a/app/view/master/foot.view.php b/app/view/master/foot.view.php index 5c52563..c295455 100644 --- a/app/view/master/foot.view.php +++ b/app/view/master/foot.view.php @@ -1,2 +1,2 @@ - - + + diff --git a/app/view/master/head.view.php b/app/view/master/head.view.php index 0c9178f..54294b8 100644 --- a/app/view/master/head.view.php +++ b/app/view/master/head.view.php @@ -2,4 +2,4 @@ - + -- cgit v1.2.3 From 5a05468fe2d78641d3adb0ba5b83bf526f4f06de Mon Sep 17 00:00:00 2001 From: M Date: Sat, 5 Dec 2015 22:53:34 -0500 Subject: + Added framework function for getting current app path * Changed sysconf view to use new function ($mod->ar()/sysconf -> $mod->ap) --- app/view/sysconf/default.view.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/view') diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index f6b5b23..b6b85ac 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -46,7 +46,8 @@

-
+ + Database Connection
Engine -- cgit v1.2.3 From 75cb46f665eeec0096dd464fe49444c2c3af5eb1 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 6 Dec 2015 15:02:15 -0500 Subject: + Adding master page modal for displaying page errors/warnings/and notices (shell only, content coming soon) --- app/view/master/foot.view.php | 8 ++++++++ app/view/master/topp.view.php | 17 +++++++++++++++++ app/view/sysconf/default.view.php | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 app/view/master/topp.view.php (limited to 'app/view') diff --git a/app/view/master/foot.view.php b/app/view/master/foot.view.php index c295455..6220f89 100644 --- a/app/view/master/foot.view.php +++ b/app/view/master/foot.view.php @@ -1,2 +1,10 @@ + +isError() || $mod->isWarning() || $mod->isNotice()) { ?> + + diff --git a/app/view/master/topp.view.php b/app/view/master/topp.view.php new file mode 100644 index 0000000..eef344e --- /dev/null +++ b/app/view/master/topp.view.php @@ -0,0 +1,17 @@ +isError() || $mod->isWarning() || $mod->isNotice()) { ?> +
+
+
+
+ Something happened. +
+ +
+ +
+
+
+
+ diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index b6b85ac..1ecedd8 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -12,6 +12,8 @@ + + -- cgit v1.2.3 From f83a90323bb359f995e7359a917eb9470a5e40e0 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 6 Dec 2015 20:51:30 -0500 Subject: + Implemented the "noticeModal" -- an object in the master MVC topp view for displaying error / warning / and notice messages + Added two helper functions to Master MVC model for retruning values to the noticeModal --- app/view/master/topp.view.php | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) (limited to 'app/view') diff --git a/app/view/master/topp.view.php b/app/view/master/topp.view.php index eef344e..fe430ff 100644 --- a/app/view/master/topp.view.php +++ b/app/view/master/topp.view.php @@ -1,16 +1,43 @@ isError() || $mod->isWarning() || $mod->isNotice()) { ?>
-
+

-
- Something happened. -
-
- +
+
+
Something Happened
+ + isError()) { ?> +
+ errorlist as $err) { ?> + Error
+ +
+ + + isWarning()) { ?> +
+ warninglist as $warn) { ?> + Warning
+ +
+ + + isNotice()) { ?> +
+ noticelist as $note) { ?> + Notice
+ +
+ + +
+ +

+

-- cgit v1.2.3 From c36269f976cb8287f1b6e17d4b0a958e4e9741da Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Thu, 24 Dec 2015 17:40:38 -0500 Subject: * Added required=true to form fields on bootstrap views --- app/view/sysconf/default.view.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/view') diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index 1ecedd8..00e6adf 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -58,17 +58,17 @@
Server Address - +

Database Name - +

Username - +

-- cgit v1.2.3 From d9b61c6ab7124730e335a4b07474462cc0fe71e0 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 2 Jan 2016 14:27:40 -0500 Subject: + Adding initial view files for common MVC --- app/view/common/foot.view.php | 1 + app/view/common/head.view.php | 1 + app/view/common/topp.view.php | 1 + 3 files changed, 3 insertions(+) create mode 100644 app/view/common/foot.view.php create mode 100644 app/view/common/head.view.php create mode 100644 app/view/common/topp.view.php (limited to 'app/view') diff --git a/app/view/common/foot.view.php b/app/view/common/foot.view.php new file mode 100644 index 0000000..a24a145 --- /dev/null +++ b/app/view/common/foot.view.php @@ -0,0 +1 @@ + diff --git a/app/view/common/head.view.php b/app/view/common/head.view.php new file mode 100644 index 0000000..87cd37d --- /dev/null +++ b/app/view/common/head.view.php @@ -0,0 +1 @@ + diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php new file mode 100644 index 0000000..40d9543 --- /dev/null +++ b/app/view/common/topp.view.php @@ -0,0 +1 @@ + -- cgit v1.2.3 From 9dc4095be9da030a40ecdc7528bcb02843037a05 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 3 Jan 2016 15:53:46 -0500 Subject: + Adding default view for Auth MVC --- app/view/auth/default.view.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 app/view/auth/default.view.php (limited to 'app/view') diff --git a/app/view/auth/default.view.php b/app/view/auth/default.view.php new file mode 100644 index 0000000..8769aa2 --- /dev/null +++ b/app/view/auth/default.view.php @@ -0,0 +1,13 @@ + + + + + + Scrott - Login + + + + + + + -- cgit v1.2.3 From e0162feea3e4f7df36fdad5a6cf83fd37972aba9 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 3 Jan 2016 18:29:45 -0500 Subject: * Start of application navbar * Digested some example code --- app/view/common/head.view.php | 7 +++++++ app/view/common/topp.view.php | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) (limited to 'app/view') diff --git a/app/view/common/head.view.php b/app/view/common/head.view.php index 87cd37d..b23ec18 100644 --- a/app/view/common/head.view.php +++ b/app/view/common/head.view.php @@ -1 +1,8 @@ + + diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php index 40d9543..05e4862 100644 --- a/app/view/common/topp.view.php +++ b/app/view/common/topp.view.php @@ -1 +1,21 @@ + +
+
+ +
+ + + Scrott +
+ +
+
Not Logged In
+
+ +
+
-- cgit v1.2.3 From 50cd689b49148c47df60d92ce33340b9a4c516b7 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Tue, 26 Jan 2016 19:05:58 -0500 Subject: + Added a basic login page design --- app/view/auth/default.view.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'app/view') diff --git a/app/view/auth/default.view.php b/app/view/auth/default.view.php index 8769aa2..9bb1c47 100644 --- a/app/view/auth/default.view.php +++ b/app/view/auth/default.view.php @@ -8,6 +8,40 @@ + +
+
+
+ +
+
+
+ + +
Login
+ +
+ Username + +
+ +
+ Password + +
+ + + +
+
+
+ +
+
+
+ -- cgit v1.2.3 From 67fb3eeb6d788b6f58d589757285a0e72a5ea3aa Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Wed, 27 Jan 2016 22:32:03 -0500 Subject: + Added view for account registration --- app/view/auth/signup.view.php | 60 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 app/view/auth/signup.view.php (limited to 'app/view') diff --git a/app/view/auth/signup.view.php b/app/view/auth/signup.view.php new file mode 100644 index 0000000..273c174 --- /dev/null +++ b/app/view/auth/signup.view.php @@ -0,0 +1,60 @@ + + + + + + Scrott - Create Account + + + + + +
+ noaccounts)) { ?> +
+
Almost there....
+
Scrott's configuration is working, but no user accounts exist.
Use the form below to signup as an admin.
+
It is presumed that you are the administrator for this Scrott install.
There is a security risk involved with exposing this page to the public!
+
+ + +
+
+ +
+
+
+
+ +
Signup for Scrott
+ +
+ Username + +
+ +
+ Password + +
+ +
+ Confirm Password + +
+ + +
+
+
+
+ +
+
+
+ + + + -- cgit v1.2.3 From 39394819d45ebcf68cab96c13a6affb994f734f3 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 6 Feb 2016 01:10:12 -0500 Subject: Merge the two auth views together For design reasons and to simplify flow of control throughout the app login/signup sequence, these two views are being merged together. This will autimately make the auth MVC less stateful, which I think is good. NOTE: This breaks the Auth MVC, the model and controller will need updated to support this new, single default view --- app/view/auth/default.view.php | 114 ++++++++++++++++++++++++++++++++--------- app/view/auth/signup.view.php | 60 ---------------------- 2 files changed, 90 insertions(+), 84 deletions(-) delete mode 100644 app/view/auth/signup.view.php (limited to 'app/view') diff --git a/app/view/auth/default.view.php b/app/view/auth/default.view.php index 9bb1c47..16085e7 100644 --- a/app/view/auth/default.view.php +++ b/app/view/auth/default.view.php @@ -3,42 +3,108 @@ - Scrott - Login + Scrott - Not logged in
-
-
- -
-
-
-
- -
Login
- -
- Username - -
+ noaccounts)) { ?> +
+
Almost there....
+
Scrott's configuration is working, but no user accounts exist.
Use the form below to signup as an admin.
+
It is presumed that you are the administrator for this Scrott install.
There is a security risk involved with exposing this page to the public!
+
+ -
- Password - -
+
+
+
+
+ +
+
+
+ + +
Login
+ +
+ Username + +
- - +
+ Password + +
+ +
+ tabSwap) { ?> + + Signup + + + + +
+ +
+

+ +

-
+
+
+
+ +
+
+
+
+ +
Signup for Scrott
+ +
+ Username + +
+ +
+ Password + +
+ +
+ Confirm Password + +
+ +
+ tabSwap) { ?> + + Cancel + + + + +
+
+
+
+
+ +
+
+

diff --git a/app/view/auth/signup.view.php b/app/view/auth/signup.view.php deleted file mode 100644 index 273c174..0000000 --- a/app/view/auth/signup.view.php +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - Scrott - Create Account - - - - - -
- noaccounts)) { ?> -
-
Almost there....
-
Scrott's configuration is working, but no user accounts exist.
Use the form below to signup as an admin.
-
It is presumed that you are the administrator for this Scrott install.
There is a security risk involved with exposing this page to the public!
-
- - -
-
- -
-
-
-
- -
Signup for Scrott
- -
- Username - -
- -
- Password - -
- -
- Confirm Password - -
- - -
-
-
-
- -
-
-
- - - - -- cgit v1.2.3 From c003600effc33db5eef3bb41d8715a3c9daf04b2 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Wed, 17 Feb 2016 20:29:11 -0500 Subject: Add 'Except' MVC -- Used to show application exception messages to user This MVC should be triggered by the root controller if normal routines throw an exception and should pass the exception message to the Except controller. --- app/view/except/default.view.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 app/view/except/default.view.php (limited to 'app/view') diff --git a/app/view/except/default.view.php b/app/view/except/default.view.php new file mode 100644 index 0000000..2aa7a73 --- /dev/null +++ b/app/view/except/default.view.php @@ -0,0 +1,24 @@ + + + + + + Scrott - Application Exception + + + + + + + +
+
+
Something happened
+
+
+ + + + -- cgit v1.2.3 From 032881ad889f7500cd3c4e60fcd23b2e1310d5c6 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 20 Feb 2016 12:23:00 -0500 Subject: Finish initial exception reporting page --- app/view/except/default.view.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'app/view') diff --git a/app/view/except/default.view.php b/app/view/except/default.view.php index 2aa7a73..7a687e5 100644 --- a/app/view/except/default.view.php +++ b/app/view/except/default.view.php @@ -15,7 +15,12 @@

-
Something happened
+
Scrott derped
+
System internals reported this:
+ +
+
message?>
+

-- cgit v1.2.3 From ec0eee8f6c5cccfc0a29ecd8cbd08be183e1eb92 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 5 Mar 2016 21:36:38 -0500 Subject: Add Dashboard MVC default view --- app/view/dashboard/default.view.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 app/view/dashboard/default.view.php (limited to 'app/view') diff --git a/app/view/dashboard/default.view.php b/app/view/dashboard/default.view.php new file mode 100644 index 0000000..059d9c8 --- /dev/null +++ b/app/view/dashboard/default.view.php @@ -0,0 +1,13 @@ + + + + + + Scrott - Dashboard + + + + + + + -- cgit v1.2.3 From 0cc2192ff7582f5f9c2c9a20adcceae3bbc1fa84 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 6 Mar 2016 15:39:06 -0500 Subject: Update application navbar The navbar now has a different view when logged in. I added the 'user button' which shows alert info and has a menu. Currently, the only menu item is 'Log out'. --- app/view/common/topp.view.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'app/view') diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php index 05e4862..460887d 100644 --- a/app/view/common/topp.view.php +++ b/app/view/common/topp.view.php @@ -14,7 +14,20 @@

-
Not Logged In
+ getCurrentUser()) { ?> +
Not Logged In
+ +
+
+ + getCurrentUser()->getDisplayName()?> + +
+
Log out
+
+
+
+

-- cgit v1.2.3 From 53472e75c050ce9b653cc70eeed56715d9a4163e Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 6 Mar 2016 17:09:55 -0500 Subject: Add settings modal to Common MVC This modal dialog will be used to change app and object settings from any page in the app. The link to open it is added to the user button menu. --- app/view/common/setting.modal.view.php | 24 ++++++++++++++++++++++++ app/view/common/topp.view.php | 3 +++ 2 files changed, 27 insertions(+) create mode 100644 app/view/common/setting.modal.view.php (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php new file mode 100644 index 0000000..27fb9d2 --- /dev/null +++ b/app/view/common/setting.modal.view.php @@ -0,0 +1,24 @@ +
+
+
+
+ + + +
Settings
+ +
+ +
+
+ +
+ +
+
+
+
diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php index 460887d..b23dc9c 100644 --- a/app/view/common/topp.view.php +++ b/app/view/common/topp.view.php @@ -1,5 +1,7 @@ + +

@@ -23,6 +25,7 @@ getCurrentUser()->getDisplayName()?>
+
Settings

Log out

-- cgit v1.2.3 From 1392664aaf8d763b5cac927df01ce763d6672d36 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 6 Mar 2016 21:42:05 -0500 Subject: Only include the Setting modal if currently logged in This prevents sending un-necessary HTML to the client on login/signup pages and allows code on the setting modal to assume that getCurrentUser() will always return an object. --- app/view/common/topp.view.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/view') diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php index b23dc9c..d520e00 100644 --- a/app/view/common/topp.view.php +++ b/app/view/common/topp.view.php @@ -1,6 +1,8 @@ - +getCurrentUser()) { ?> + +

-- cgit v1.2.3 From ae2704f45ead57d437627efe7e4d44a564d923c4 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 6 Mar 2016 22:04:37 -0500 Subject: Add User settings tab for Setting modal This commit adds the basic structure to the Setting modal in Common MVC. The meat of this commit is the content for the webform for the modal's form for user account settings. The next commit should implement form submission handling. --- app/view/common/setting.modal.view.php | 87 ++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 5 deletions(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 27fb9d2..90d68f8 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -12,12 +12,89 @@

-
+
+
+ getCurrentUser()->getDisplayName()?> +
-
- + getCurrentUser()->admin == 1) { ?> +
Admin
+
All Users
+ +
+ +
+
+

+ + getCurrentUser()->admin == 1) { ?> +
getCurrentUser()->getDisplayName()?> is a Scrott Administrator
+ + +
+ +
+ Username + +
+ +
+ + Change Password + +
+ +
+
+ Current Password + +
+ +
+ New Password + +
+ +
+ Confirm Password + +
+
+ +
+ Alias + +
+ +
+ Email + +
+ + getCurrentUser()->email != "" && $mod->getCurrentUser()->emailConf == 0) { ?> +
+ Email Confirmation Key + + You have not yet confirmed ownership of your saved email address +
+ + + +
+ +

+
+ + getCurrentUser()->admin == 1) { ?> +
+ admin schings +
+ +
+ all users' schings +
+ +

-- cgit v1.2.3 From 2bf97f71f42bc68b076114834cc65466e9133b9c Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Fri, 11 Mar 2016 19:40:59 -0500 Subject: Add view for Setting modal, admin tab --- app/view/common/setting.modal.view.php | 40 +++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 90d68f8..0735e3f 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -87,7 +87,45 @@ getCurrentUser()->admin == 1) { ?>
- admin schings +

+ +
+ +
+ HTTP(S) +
+ + + Always Force SSL + +
+ +
+ + + Neither + +
+ +
+ + + Always Forbid SSL + +
+
+ + Access +
+ + Allow anyone to create an account + +
+ + +
+ +

-- cgit v1.2.3 From 3bd0d2779534221af0db22e5b5bc86faaa3b2957 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Fri, 11 Mar 2016 22:25:00 -0500 Subject: Populate admin setting fields on page load Added logic to set initial state of fields on the setting modal's admin tab --- app/view/common/setting.modal.view.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 0735e3f..909eead 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -95,21 +95,21 @@ HTTP(S)
- + common_settingAdminSettSSLChecked['force']?> common_settingAdminSettSSLDisabled?> /> Always Force SSL

- + common_settingAdminSettSSLChecked['neither']?> common_settingAdminSettSSLDisabled?> /> Neither

- + common_settingAdminSettSSLChecked['forbid']?> common_settingAdminSettSSLDisabled?> /> Always Forbid SSL
@@ -118,7 +118,7 @@ Access
- Allow anyone to create an account + common_settingAdminAllowPublicSignupChecked?> /> Allow anyone to create an account
-- cgit v1.2.3 From cc755e3756e43109d0db0de963b3a132039456b1 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 12 Mar 2016 15:05:12 -0500 Subject: Alter representation of form boolean values Changed how Form() objects model true and false for boolean fields. Was "true" and "false", is now "1" and "0", respectivly. This is to address how Mysql handles these values as they are pushed to the db. --- app/view/common/setting.modal.view.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 909eead..d9a834b 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -40,7 +40,7 @@
- Change Password + Change Password
@@ -118,7 +118,7 @@ Access
- common_settingAdminAllowPublicSignupChecked?> /> Allow anyone to create an account + common_settingAdminAllowPublicSignupChecked?> /> Allow anyone to create an account
-- cgit v1.2.3 From 2936f0d151fb52bd2649edc37abd2e1d559d1f0f Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 12 Mar 2016 23:38:18 -0500 Subject: Move getUserGlyphicon function from common model into user class --- app/view/common/topp.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/view') diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php index d520e00..40ad3fe 100644 --- a/app/view/common/topp.view.php +++ b/app/view/common/topp.view.php @@ -24,7 +24,7 @@

- getCurrentUser()->getDisplayName()?> + getCurrentUser()->getDisplayName()?>

Settings
-- cgit v1.2.3 From d60706acd0ac810783a24d2e33b76f6955d72599 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 13 Mar 2016 16:54:17 -0400 Subject: Add view for setting modal, all users admin tab --- app/view/common/setting.modal.view.php | 54 +++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index d9a834b..88a933d 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -129,7 +129,59 @@

- all users' schings +

+ +
+
+
+
+ + Add New User + +
+
+ +
+
+
+ +
+ Username + +
+ +
+ Password + +
+ +
+ Confirm Password + +
+ +
+ + Administrator + +
+ +
+ Alias + +
+ +
+ Email + +
+ + +
+
+
+
+

-- cgit v1.2.3 From ded0da07ab8d784c7d257a9487fef096032c5521 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 13 Mar 2016 20:51:40 -0400 Subject: Fix s and s that use unnecessary DOM IDs I dont need to give these elements IDs, so I'm not going to --- app/view/auth/default.view.php | 20 ++++++++++---------- app/view/common/setting.modal.view.php | 28 ++++++++++++++-------------- app/view/sysconf/default.view.php | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) (limited to 'app/view') diff --git a/app/view/auth/default.view.php b/app/view/auth/default.view.php index 16085e7..83bb495 100644 --- a/app/view/auth/default.view.php +++ b/app/view/auth/default.view.php @@ -31,13 +31,13 @@
Login

- Username - + Username +

- Password - + Password +

@@ -72,18 +72,18 @@
Signup for Scrott

- Username - + Username +

- Password - + Password +

- Confirm Password - + Confirm Password +

diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 88a933d..c9587a0 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -34,8 +34,8 @@

- Username - + Username +

@@ -46,35 +46,35 @@

- Current Password - + Current Password +

- New Password - + New Password +

- Confirm Password - + Confirm Password +

- Alias - + Alias +

- Email - + Email +
getCurrentUser()->email != "" && $mod->getCurrentUser()->emailConf == 0) { ?>
- Email Confirmation Key - + Email Confirmation Key + You have not yet confirmed ownership of your saved email address
diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index 00e6adf..65f7cb6 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -52,34 +52,34 @@ Database Connection
- Engine - + Engine +

- Server Address - + Server Address +

- Database Name - + Database Name +

- Username - + Username +

- Password - + Password +
Application Installation
- Install Location - + Install Location +
Detected from location of files in web document root

-- cgit v1.2.3 From e18f080a81c34204d7aa66441cdf9734d88cb30d Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 13 Mar 2016 22:18:45 -0400 Subject: Fix maxlengths for fields on user objects Usernames, aliai, and email addresses are capped at 50 chars in the backend --- app/view/common/setting.modal.view.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index c9587a0..93a273a 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -63,12 +63,12 @@
Alias - +

Email - +
getCurrentUser()->email != "" && $mod->getCurrentUser()->emailConf == 0) { ?> @@ -147,7 +147,7 @@
Username - +

@@ -168,12 +168,12 @@
Alias - +

Email - +
-- cgit v1.2.3 From 99ec6644fc93ee4d6bd8569148de6a03d64f69cb Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 26 Mar 2016 17:18:08 -0400 Subject: Add collapsable panel for editing each user's settings to admin setting tab Also, added relevant initialization code to common model --- app/view/common/setting.modal.view.php | 62 ++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 93a273a..11adc69 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -181,6 +181,68 @@

+ + common_settingAllUsers as $user) { ?> +
+
+
+ + name?> alias != "" ? "(" . $user->alias . ")" : "")?> + +
+
+ +
+
+ + + + +
+ Username + +
+ +
+ + Change Password + +
+ +
+
+ New Password + +
+ +
+ Confirm Password + +
+
+ +
+ + admin ? "checked" : "")?>> Administrator + +
+ +
+ Alias + +
+ +
+ Email + +
+ + + +
+
+
+

-- cgit v1.2.3 From 679ab64e465f610ae70aff8a1b491191863f7033 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Fri, 1 Apr 2016 00:56:34 -0400 Subject: Update setting modal, user tab to display user head image Also restructured the web form a little and added the form-group to select a new image to upload --- app/view/common/setting.modal.view.php | 47 ++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 11 deletions(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 11adc69..2415e18 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -27,21 +27,46 @@

- getCurrentUser()->admin == 1) { ?> -
getCurrentUser()->getDisplayName()?> is a Scrott Administrator
- -
-
- Username - + +
+
+ getCurrentUser()->admin == 1) { ?> +
getCurrentUser()->getDisplayName()?> is a Scrott Administrator
+ + +
+ Username + +
+ +
+ + Change Password + +
+
+ +
+ +
+
+ +
+ +

-
- - Change Password - +
+
+ User Image + +

-- cgit v1.2.3 From 0ad5c4d29ca5d4109a7fe33cdfc9b8e6b01ace6b Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Mon, 4 Apr 2016 23:35:23 -0400 Subject: Add view markup for showing user head images to the all users collapse panes --- app/view/common/setting.modal.view.php | 38 +++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 2415e18..19bcf5c 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -223,15 +223,39 @@ -
- Username - +
+
+
+ Username + +
+ +
+ + Change Password + +
+
+ +
+ +
+
+ +
+ +

-
- - Change Password - +
+
+ User Image + +

-- cgit v1.2.3 From 423fa09e3f524c8139d18c3e8652f542bcf2cd44 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Wed, 27 Apr 2016 23:38:49 -0400 Subject: Update form handler for common/setting-modal, user tab Now supports file upload to replace the user's head image --- app/view/common/setting.modal.view.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 19bcf5c..1d7951a 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -27,7 +27,7 @@

- +
@@ -65,7 +65,7 @@

User Image - +

-- cgit v1.2.3 From be1a82affdaa1e87015a0a49979e9230cdc61b4d Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 30 Apr 2016 16:18:24 -0400 Subject: Update form handler for common/setting-modal, all users tab Now supports file upload to replace the user's head image --- app/view/common/setting.modal.view.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/view') diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 1d7951a..369a789 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -219,7 +219,7 @@

- + @@ -254,7 +254,7 @@

User Image - +

-- cgit v1.2.3 From 519035a6eb28dd36ce898a80d652c08138b110c5 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 30 Apr 2016 20:18:10 -0400 Subject: Add global javascript file scrott.js Included initial function assertConfirm(), function to present user an "Are you sure?" prompt before submitting a web form. --- app/view/master/foot.view.php | 1 + 1 file changed, 1 insertion(+) (limited to 'app/view') diff --git a/app/view/master/foot.view.php b/app/view/master/foot.view.php index 6220f89..c749ad0 100644 --- a/app/view/master/foot.view.php +++ b/app/view/master/foot.view.php @@ -1,5 +1,6 @@ + isError() || $mod->isWarning() || $mod->isNotice()) { ?> diff --git a/app/view/master/head.view.php b/app/view/master/head.view.php index 54294b8..3e4e110 100644 --- a/app/view/master/head.view.php +++ b/app/view/master/head.view.php @@ -1,3 +1,21 @@ + + diff --git a/app/view/master/topp.view.php b/app/view/master/topp.view.php index fe430ff..9a0b0fe 100644 --- a/app/view/master/topp.view.php +++ b/app/view/master/topp.view.php @@ -1,3 +1,21 @@ + + isError() || $mod->isWarning() || $mod->isNotice()) { ?>

diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php index 65f7cb6..90e5441 100644 --- a/app/view/sysconf/default.view.php +++ b/app/view/sysconf/default.view.php @@ -1,3 +1,17 @@ + + diff --git a/app/view/sysconf/group.modal.view.php b/app/view/sysconf/group.modal.view.php index cd05642..c0641d9 100644 --- a/app/view/sysconf/group.modal.view.php +++ b/app/view/sysconf/group.modal.view.php @@ -1,3 +1,21 @@ + +

diff --git a/app/view/sysconf/issue.modal.view.php b/app/view/sysconf/issue.modal.view.php index a77c1e3..694dd47 100644 --- a/app/view/sysconf/issue.modal.view.php +++ b/app/view/sysconf/issue.modal.view.php @@ -1,3 +1,21 @@ + +

diff --git a/app/view/sysconf/message.modal.view.php b/app/view/sysconf/message.modal.view.php index 715bb06..14cca2d 100644 --- a/app/view/sysconf/message.modal.view.php +++ b/app/view/sysconf/message.modal.view.php @@ -1,3 +1,21 @@ + +

diff --git a/app/view/sysconf/pad.modal.view.php b/app/view/sysconf/pad.modal.view.php index 88c62e7..2fbf26b 100644 --- a/app/view/sysconf/pad.modal.view.php +++ b/app/view/sysconf/pad.modal.view.php @@ -1,3 +1,21 @@ + +

diff --git a/app/view/sysconf/stage.modal.view.php b/app/view/sysconf/stage.modal.view.php index 4eaab43..11e517f 100644 --- a/app/view/sysconf/stage.modal.view.php +++ b/app/view/sysconf/stage.modal.view.php @@ -1,3 +1,21 @@ + +

diff --git a/app/view/sysconf/user.modal.view.php b/app/view/sysconf/user.modal.view.php index b3650b0..034dc04 100644 --- a/app/view/sysconf/user.modal.view.php +++ b/app/view/sysconf/user.modal.view.php @@ -1,3 +1,21 @@ + +

-- cgit v1.2.3 From 567736d4d7a880b74bf86494cf43296b18ed40d1 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Wed, 1 Jun 2016 19:55:21 -0400 Subject: Add modal view to create a new user group --- app/view/common/newgroup.modal.view.php | 49 +++++++++++++++++++++++++++++++++ app/view/common/topp.view.php | 12 ++++++++ 2 files changed, 61 insertions(+) create mode 100644 app/view/common/newgroup.modal.view.php (limited to 'app/view') diff --git a/app/view/common/newgroup.modal.view.php b/app/view/common/newgroup.modal.view.php new file mode 100644 index 0000000..379683b --- /dev/null +++ b/app/view/common/newgroup.modal.view.php @@ -0,0 +1,49 @@ + + +
+
+
+
+ + + +
Create new Group
+ +
+ +
+ + +
+ Group Name + +
+ + + + +

+
+
+
+
diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php index 5908462..9ec40fa 100644 --- a/app/view/common/topp.view.php +++ b/app/view/common/topp.view.php @@ -20,6 +20,7 @@ getCurrentUser()) { ?> +
@@ -39,6 +40,17 @@ getCurrentUser()) { ?>
Not Logged In
+
+
+ + + +
+
New Group
+
+
+
+

-- cgit v1.2.3 From ca94dff5d7587c1f401acb022d2598ebb4c06376 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Wed, 1 Jun 2016 22:41:29 -0400 Subject: Update newgroup modal Made the name field (the only field) on this form as required. --- app/view/common/newgroup.modal.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/view') diff --git a/app/view/common/newgroup.modal.view.php b/app/view/common/newgroup.modal.view.php index 379683b..3dd631c 100644 --- a/app/view/common/newgroup.modal.view.php +++ b/app/view/common/newgroup.modal.view.php @@ -34,7 +34,7 @@
Group Name - +
+
+ + +
+
+ +
+
+ Group Image + +
+
+ + + + + + +

+

+ + + + +

-- cgit v1.2.3 From c45e5d50970fd285e93ca318c6e91e9f98ba1504 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 00:00:24 -0400 Subject: Change permissions view template into a PHP function This change will allow us to use this in different contextes, even on a single page render. --- app/view/common/permissions.setting.modal.view.php | 102 +++++++++++---------- 1 file changed, 52 insertions(+), 50 deletions(-) (limited to 'app/view') diff --git a/app/view/common/permissions.setting.modal.view.php b/app/view/common/permissions.setting.modal.view.php index bd4b7cd..55e4157 100644 --- a/app/view/common/permissions.setting.modal.view.php +++ b/app/view/common/permissions.setting.modal.view.php @@ -16,65 +16,67 @@ ?> -obj->canModifyPermissions($mod->getCurrentUser())) { ?> - Permissions -
-
-
- - obj->perms & 0x100 ? "checked" : "")?> /> Members can modify - -
+ + canModifyPermissions($mod->getCurrentUser())) { ?> + Permissions +
+
+
+ + perms & 0x100 ? "checked" : "")?> /> Members can modify + +
-
- - obj->perms & 0x080 ? "checked" : "")?> /> Members can modify members - -
+
+ + perms & 0x080 ? "checked" : "")?> /> Members can modify members + +
-
- - obj->perms & 0x040 ? "checked" : "")?> /> Members can access children - -
+
+ + perms & 0x040 ? "checked" : "")?> /> Members can access children + +
-
- - obj->perms & 0x020 ? "checked" : "")?> /> Members can create children - -
+
+ + perms & 0x020 ? "checked" : "")?> /> Members can create children + +
-
- - obj->perms & 0x010 ? "checked" : "")?> /> Members can modify children - -
+
+ + perms & 0x010 ? "checked" : "")?> /> Members can modify children + +
-
- - obj->perms & 0x008 ? "checked" : "")?> /> Members can modify children's members - +
+ + perms & 0x008 ? "checked" : "")?> /> Members can modify children's members + +

-
-
-
- - obj->perms & 0x004 ? "checked" : "")?> /> Public can access - -
+
+
+ + perms & 0x004 ? "checked" : "")?> /> Public can access + +
-
- - obj->perms & 0x002 ? "checked" : "")?> /> Public can access children - -
+
+ + perms & 0x002 ? "checked" : "")?> /> Public can access children + +
-
- - obj->perms & 0x001 ? "checked" : "")?> /> Public can create children - +
+ + perms & 0x001 ? "checked" : "")?> /> Public can create children + +

-
+ -- cgit v1.2.3 From cdcc2bcb837729ffdc365e3701865298433b1c73 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 00:11:16 -0400 Subject: Change ownership view template into a PHP function --- app/view/common/ownership.setting.modal.view.php | 26 +++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'app/view') diff --git a/app/view/common/ownership.setting.modal.view.php b/app/view/common/ownership.setting.modal.view.php index 857ccb4..3f7c382 100644 --- a/app/view/common/ownership.setting.modal.view.php +++ b/app/view/common/ownership.setting.modal.view.php @@ -16,18 +16,20 @@ ?> -obj->isOwner($mod->getCurrentUser())) { ?> - Change Owner -
- - Transfer Ownership - -
+ + isOwner($mod->getCurrentUser())) { ?> + Change Owner +
+ + Transfer Ownership + +
-
-
- Owner Username - +
+
+ Owner Username + +

-
+ -- cgit v1.2.3 From ee3b66018804b332ec2a2953a1d04b7e0beb68fa Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 00:31:15 -0400 Subject: Update group setting tab to use parameterized view templates --- app/view/common/group.setting.modal.view.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/view') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index e2a73e0..bf6b6c5 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -16,6 +16,9 @@ ?> + + +

@@ -55,8 +58,8 @@

- - + group); ?> + group); ?> -- cgit v1.2.3 From cc285f5d019e5b586931a2a582374074825de947 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 12:49:34 -0400 Subject: Revert "Update group setting tab to use parameterized view templates" This reverts commit ee3b66018804b332ec2a2953a1d04b7e0beb68fa. --- app/view/common/group.setting.modal.view.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'app/view') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index bf6b6c5..e2a73e0 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -16,9 +16,6 @@ ?> - - -

@@ -58,8 +55,8 @@

- group); ?> - group); ?> + + -- cgit v1.2.3 From f69fe67dec557c27b38535d7e51ed22ae0740e03 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 12:52:22 -0400 Subject: Revert "Revert "Update group setting tab to use parameterized view templates"" This reverts commit cc285f5d019e5b586931a2a582374074825de947. --- app/view/common/group.setting.modal.view.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/view') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index e2a73e0..bf6b6c5 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -16,6 +16,9 @@ ?> + + +

@@ -55,8 +58,8 @@

- - + group); ?> + group); ?> -- cgit v1.2.3 From 98ba4abeff20ae83de84451c4aeb0c68d043ab45 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 19:18:59 -0400 Subject: Finish markup for setting modal group tab --- app/view/common/group.setting.modal.view.php | 39 +++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'app/view') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index bf6b6c5..d0e11ca 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -17,7 +17,6 @@ ?> -

@@ -59,17 +58,39 @@
group); ?> - group); ?> - + group->canModify($mod->getCurrentUser())) { ?> +

+ + + -

-

+

+

- - +
+ group->canModifyMembers($mod->getCurrentUser())) { ?> +
+ + Manage Members + +
+ + + group->isOwner($mod->getCurrentUser())) { ?> +
+ + Transfer Ownership + +
+ +
+ + Delete Group + +
+ +

-- cgit v1.2.3 From ed99654d2e139a847a63e9295bf976d17462ee34 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 22 Oct 2016 00:29:30 -0400 Subject: Deprecate application code Setup to perform an iteration of development focused on a simpler implementation and eliminating redundancy in design. --- app/view/auth/default.view.php | 127 -------- app/view/common/foot.view.php | 19 -- app/view/common/group.setting.modal.view.php | 96 ------ app/view/common/head.view.php | 26 -- app/view/common/newgroup.modal.view.php | 49 --- app/view/common/ownership.setting.modal.view.php | 35 --- app/view/common/permissions.setting.modal.view.php | 82 ----- app/view/common/setting.modal.view.php | 346 --------------------- app/view/common/topp.view.php | 83 ----- app/view/dashboard/default.view.php | 27 -- app/view/deleteacct/default.view.php | 51 --- app/view/except/default.view.php | 47 --- app/view/master/foot.view.php | 29 -- app/view/master/head.view.php | 23 -- app/view/master/topp.view.php | 62 ---- app/view/obj/group.view.php | 43 --- app/view/sysconf/default.view.php | 138 -------- app/view/sysconf/group.modal.view.php | 49 --- app/view/sysconf/issue.modal.view.php | 52 ---- app/view/sysconf/message.modal.view.php | 55 ---- app/view/sysconf/pad.modal.view.php | 68 ---- app/view/sysconf/stage.modal.view.php | 52 ---- app/view/sysconf/user.modal.view.php | 48 --- 23 files changed, 1607 deletions(-) delete mode 100644 app/view/auth/default.view.php delete mode 100644 app/view/common/foot.view.php delete mode 100644 app/view/common/group.setting.modal.view.php delete mode 100644 app/view/common/head.view.php delete mode 100644 app/view/common/newgroup.modal.view.php delete mode 100644 app/view/common/ownership.setting.modal.view.php delete mode 100644 app/view/common/permissions.setting.modal.view.php delete mode 100644 app/view/common/setting.modal.view.php delete mode 100644 app/view/common/topp.view.php delete mode 100644 app/view/dashboard/default.view.php delete mode 100644 app/view/deleteacct/default.view.php delete mode 100644 app/view/except/default.view.php delete mode 100644 app/view/master/foot.view.php delete mode 100644 app/view/master/head.view.php delete mode 100644 app/view/master/topp.view.php delete mode 100644 app/view/obj/group.view.php delete mode 100644 app/view/sysconf/default.view.php delete mode 100644 app/view/sysconf/group.modal.view.php delete mode 100644 app/view/sysconf/issue.modal.view.php delete mode 100644 app/view/sysconf/message.modal.view.php delete mode 100644 app/view/sysconf/pad.modal.view.php delete mode 100644 app/view/sysconf/stage.modal.view.php delete mode 100644 app/view/sysconf/user.modal.view.php (limited to 'app/view') diff --git a/app/view/auth/default.view.php b/app/view/auth/default.view.php deleted file mode 100644 index 9d4c9b4..0000000 --- a/app/view/auth/default.view.php +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - Scrott - Not logged in - - - - - -
- noaccounts)) { ?> -
-
Almost there....
-
Scrott's configuration is working, but no user accounts exist.
Use the form below to signup as an admin.
-
It is presumed that you are the administrator for this Scrott install.
There is a security risk involved with exposing this page to the public!
-
- - -
-
-
-
- -
-
-
-
- -
Login
- -
- Username - -
- -
- Password - -
- -
- tabSwap) { ?> - - Signup - - - - -
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
-
- -
Signup for Scrott
- -
- Username - -
- -
- Password - -
- -
- Confirm Password - -
- -
- tabSwap) { ?> - - Cancel - - - - -
-
-
-
-
- -
-
-
-
-
- - - - diff --git a/app/view/common/foot.view.php b/app/view/common/foot.view.php deleted file mode 100644 index 977ac04..0000000 --- a/app/view/common/foot.view.php +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php deleted file mode 100644 index d0e11ca..0000000 --- a/app/view/common/group.setting.modal.view.php +++ /dev/null @@ -1,96 +0,0 @@ - - - - -
-

- -
- - - -
-
-
- Group name - group->canModify($mod->getCurrentUser()) ? "" : "disabled")?> /> -
-
- -
- - - group->canModify($mod->getCurrentUser())) { ?> -
-
- -
- - -
-
- -
-
- Group Image - -
-
- - group); ?> - - group->canModify($mod->getCurrentUser())) { ?> -

- - -
- -

-

- -
- group->canModifyMembers($mod->getCurrentUser())) { ?> -
- - Manage Members - -
- - - group->isOwner($mod->getCurrentUser())) { ?> -
- - Transfer Ownership - -
- -
- - Delete Group - -
- -
- -

-
diff --git a/app/view/common/head.view.php b/app/view/common/head.view.php deleted file mode 100644 index 76880a6..0000000 --- a/app/view/common/head.view.php +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/app/view/common/newgroup.modal.view.php b/app/view/common/newgroup.modal.view.php deleted file mode 100644 index 3dd631c..0000000 --- a/app/view/common/newgroup.modal.view.php +++ /dev/null @@ -1,49 +0,0 @@ - - -
-
-
-
- - - -
Create new Group
- -
- -
-
- -
- Group Name - -
- - -
- -

-
-
-
-
diff --git a/app/view/common/ownership.setting.modal.view.php b/app/view/common/ownership.setting.modal.view.php deleted file mode 100644 index 3f7c382..0000000 --- a/app/view/common/ownership.setting.modal.view.php +++ /dev/null @@ -1,35 +0,0 @@ - - - - isOwner($mod->getCurrentUser())) { ?> - Change Owner -
- - Transfer Ownership - -
- -
-
- Owner Username - -
-
- - diff --git a/app/view/common/permissions.setting.modal.view.php b/app/view/common/permissions.setting.modal.view.php deleted file mode 100644 index 55e4157..0000000 --- a/app/view/common/permissions.setting.modal.view.php +++ /dev/null @@ -1,82 +0,0 @@ - - - - canModifyPermissions($mod->getCurrentUser())) { ?> - Permissions -
-
-
- - perms & 0x100 ? "checked" : "")?> /> Members can modify - -
- -
- - perms & 0x080 ? "checked" : "")?> /> Members can modify members - -
- -
- - perms & 0x040 ? "checked" : "")?> /> Members can access children - -
- -
- - perms & 0x020 ? "checked" : "")?> /> Members can create children - -
- -
- - perms & 0x010 ? "checked" : "")?> /> Members can modify children - -
- -
- - perms & 0x008 ? "checked" : "")?> /> Members can modify children's members - -
-
- -
-
- - perms & 0x004 ? "checked" : "")?> /> Public can access - -
- -
- - perms & 0x002 ? "checked" : "")?> /> Public can access children - -
- -
- - perms & 0x001 ? "checked" : "")?> /> Public can create children - -
-
-
- - diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php deleted file mode 100644 index 2217805..0000000 --- a/app/view/common/setting.modal.view.php +++ /dev/null @@ -1,346 +0,0 @@ - - -
-
-
-
- - - -
Settings
- -
- -
-
- common_settingShowTab['group']) { ?> -
- group->name?> -
- - -
- getCurrentUser()->getDisplayName()?> -
- - getCurrentUser()->admin == 1) { ?> -
Admin
-
All Users
- -
- -
- common_settingShowTab['group']) { ?> - - - -
-

- -
- - -
-
- getCurrentUser()->admin == 1) { ?> -
getCurrentUser()->getDisplayName()?> is a Scrott Administrator
- - -
- Username - -
- -
- - Change Password - -
-
- -
- -
-
- -
- -
-
- -
-
- User Image - -
-
- -
-
- Current Password - -
- -
- New Password - -
- -
- Confirm Password - -
-
- -
- Alias - -
- -
- Email - -
- - getCurrentUser()->email != "" && $mod->getCurrentUser()->emailConf == 0) { ?> -
- Email Confirmation Key - - You have not yet confirmed ownership of your saved email address -
- - - -
- -

-

- - Delete Account - -

-
- - getCurrentUser()->admin == 1) { ?> -
-

- -
- -
- HTTP(S) -
- - common_settingAdminSettSSLChecked['force']?> common_settingAdminSettSSLDisabled?> /> - Always Force SSL - -
- -
- - common_settingAdminSettSSLChecked['neither']?> common_settingAdminSettSSLDisabled?> /> - Neither - -
- -
- - common_settingAdminSettSSLChecked['forbid']?> common_settingAdminSettSSLDisabled?> /> - Always Forbid SSL - -
-
- - Access -
- - common_settingAdminAllowPublicSignupChecked?> /> Allow anyone to create an account - -
- - -
- -

-
- -
-

- -
-
-
-
- - Add New User - -
-
- -
-
-
- -
- Username - -
- -
- Password - -
- -
- Confirm Password - -
- -
- - Administrator - -
- -
- Alias - -
- -
- Email - -
- - -
-
-
-
- - common_settingAllUsers as $user) { ?> -
-
-
- - name?> alias != "" ? "(" . $user->alias . ")" : "")?> - -
-
- -
-
-
- - - -
-
-
- Username - -
- -
- - Change Password - -
-
- -
- -
-
- -
- -
-
- -
-
- User Image - -
-
- -
-
- New Password - -
- -
- Confirm Password - -
-
- -
- - admin ? "checked" : "")?>> Administrator - -
- -
- Alias - -
- -
- Email - -
- - -
- -

-

- -
- - - -
-
-
-
- -
-
- -
-
-
-
-
diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php deleted file mode 100644 index d9e0df0..0000000 --- a/app/view/common/topp.view.php +++ /dev/null @@ -1,83 +0,0 @@ - - - - -getCurrentUser()) { ?> - - - - -
-
- -
- - - Scrott -
- -
- getCurrentUser()) { ?> -
Not Logged In
- -
-
- -
- - obj) ? $mod->obj->name : "Dashboard")?> - - -
- getCurrentUser()->getGroups() as $group) { ?> -
name?>
- -
-
- -
- - - -
-
New Group
-
-
-
- -
-
- - getCurrentUser()->getDisplayName()?> - -
-
Settings
-
Log out
-
-
-
- -
- -
-
diff --git a/app/view/dashboard/default.view.php b/app/view/dashboard/default.view.php deleted file mode 100644 index caf78da..0000000 --- a/app/view/dashboard/default.view.php +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - Scrott - Dashboard - - - - - - - diff --git a/app/view/deleteacct/default.view.php b/app/view/deleteacct/default.view.php deleted file mode 100644 index 852a37e..0000000 --- a/app/view/deleteacct/default.view.php +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - Scrott - Delete user account - - - - - -
-
-
Warning: Deleting your user account!
- -
-
- -
Are you sure?!
-
Please confirm you want to delete your Scrott account. Type your current password in the box below and click the confirm button
- -
- Password - -
- - -
-
-
-
- - - - diff --git a/app/view/except/default.view.php b/app/view/except/default.view.php deleted file mode 100644 index 01cf123..0000000 --- a/app/view/except/default.view.php +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - Scrott - Application Exception - - - - - - - -
-
-
Scrott derped
-
System internals reported this:
- -
-
message?>
-
- - - Go to Scrott Dashboard - -
-
- - - - diff --git a/app/view/master/foot.view.php b/app/view/master/foot.view.php deleted file mode 100644 index 6279b05..0000000 --- a/app/view/master/foot.view.php +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - -isError() || $mod->isWarning() || $mod->isNotice()) { ?> - - diff --git a/app/view/master/head.view.php b/app/view/master/head.view.php deleted file mode 100644 index 3e4e110..0000000 --- a/app/view/master/head.view.php +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/view/master/topp.view.php b/app/view/master/topp.view.php deleted file mode 100644 index 9a0b0fe..0000000 --- a/app/view/master/topp.view.php +++ /dev/null @@ -1,62 +0,0 @@ - - -isError() || $mod->isWarning() || $mod->isNotice()) { ?> -
-
-
- -
-
-
Something Happened
- - isError()) { ?> -
- errorlist as $err) { ?> - Error
- -
- - - isWarning()) { ?> -
- warninglist as $warn) { ?> - Warning
- -
- - - isNotice()) { ?> -
- noticelist as $note) { ?> - Notice
- -
- - -
- -
-
- -
-
-
- diff --git a/app/view/obj/group.view.php b/app/view/obj/group.view.php deleted file mode 100644 index dde4df1..0000000 --- a/app/view/obj/group.view.php +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - Scrott - <?=$mod->group->name?> - - - - - -
-
-
group->name?>
- - - members)) { ?> - - - - members as $member) { ?> - - -
-
- - - - diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php deleted file mode 100644 index 90e5441..0000000 --- a/app/view/sysconf/default.view.php +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - Scrott - System-level configuration missing - - - - - - - - - - - - - - -
-
-
-     -     -     -     -     - -
- -
Welcome to Scrott!
-
- -
You're seeing this page because the file "scrott.conf.php" is missing.
Please fill out the form below to create a config automatically!
-
Click the icons above to learn more about core Scrott features and constructs!
-
- -
This form will initialize Scrott's system-level configuration.
These are things the app needs before it can begin functioning at all!
-
It is presumed that you are the administrator for this Scrott install.
There is a security risk involved with exposing this page to the public!
- -
-
- -
-
-
-
- - Database Connection -
- Engine - -
- -
- Server Address - -
- -
- Database Name - -
- -
- Username - -
- -
- Password - -
- - Application Installation -
- Install Location - -
Detected from location of files in web document root
-
- - Settings -
- HTTP(S) -
- - - Always Force SSL - -
- -
- - - Neither (Application can override) - -
- -
- - - Always Forbid SSL - -
-
- - -
-
-
-
- -
-
-
-
- - - - diff --git a/app/view/sysconf/group.modal.view.php b/app/view/sysconf/group.modal.view.php deleted file mode 100644 index c0641d9..0000000 --- a/app/view/sysconf/group.modal.view.php +++ /dev/null @@ -1,49 +0,0 @@ - - -
-
-
-
- - - -
User Groups
- -
- -
-
Groups make sharing objects and collaborating easier. Instead of creating your - own pad and adding each of your team members to it individualy, create a - group-owned pad. With the appropriate permissions set, all group members will be - able to use the pad. This also solves issues where a shared pad is owned by a - single user whose account gets closed. Instead pads and other objects are safe as - long as the group exists. Groups are owned and managed by a single user, who must - stick around or transfer ownership for the group to continue functioning.
-
- -
- -
-
-
-
diff --git a/app/view/sysconf/issue.modal.view.php b/app/view/sysconf/issue.modal.view.php deleted file mode 100644 index 694dd47..0000000 --- a/app/view/sysconf/issue.modal.view.php +++ /dev/null @@ -1,52 +0,0 @@ - - -
-
-
-
- - - -
Issues
- -
- -
-
Issues represent work. This work could be anything from a software project's bug - needing fixed or a new feature to implement to a record of needing to order more - celing panels for the new home office build. Work is done by someone, for someone, - and this is reflected in Scrott's internal data structures. Every issues has a - distinct owner (someone requesting work be done) and assignee (someone who needs to - do the work). If others are interested in the work or have valuable input on the - work, they may be included (cc'd) on the issue to receive updates on it or to be able - to post their own updates. Scrott tracks issues using pads which are representative - of a high-level project or some similar effort. So related issues are tracked - together.
-
- -
- -
-
-
-
diff --git a/app/view/sysconf/message.modal.view.php b/app/view/sysconf/message.modal.view.php deleted file mode 100644 index 14cca2d..0000000 --- a/app/view/sysconf/message.modal.view.php +++ /dev/null @@ -1,55 +0,0 @@ - - -
-
-
-
- - - -
Messages
- -
- -
-
Although Scrott is formost an issue-tracking tool, it can also be a useful - communication tool for team and client relationships. Scrott includes a lightweight - messaging system that is aparent:
-
-
In pads: where users can start new general discussion threads and post - replys
-
In issues: where users can post comments or updates on work status
-
In general: where users can send other users direct private messages
-
-
With email integration, Scrott also allows communication with non-scrott user - clients or owners of issues.
-
Scrott's built-in logging system utilizes this messaging framework and is used - by object owners and site administrators to monitor usage and activity on Scrott
-
- -
- -
-
-
-
diff --git a/app/view/sysconf/pad.modal.view.php b/app/view/sysconf/pad.modal.view.php deleted file mode 100644 index 2fbf26b..0000000 --- a/app/view/sysconf/pad.modal.view.php +++ /dev/null @@ -1,68 +0,0 @@ - - -
-
-
-
- - - -
Pads
- -
- -
-
Use pads to track tasks, issues, bugs, client tickets, etc. Within Scrott, these - are collectively referred to as 'issues'. Use a pad to track your progress on a - project's completion, to manage user issues for a help-desk, to keep a shopping list, - bucket list, lists to track your progress on a television series (or series you'd - like to start), or books to read, or anything inbetween.
- -
In addition to issue tracking, pads enable users to communicate with one another. - Each pad consists of a lightweight message board (forum) and users can also post - messages directly to issues if they are relevant. With email integration, even - non-scrott users may be clued in to the progress of their open issues. Pads even - allow for message threads to be converted (elevated) to a new open issue if need be. - (for example: Imagine you started a thread to discuss a potential new website design. - Once your team had arrived at something the majority liked, the thread can be elevated - to a new issue (preserving all messaging history), assigned to one of the team - members, and tracked just like all of your other issues.)
- -
If you would like to allow the public to open issues in your pad (ie: if your pad - is allowing bug reports/feature requests from users of your project or if your pad - is the issue tracker for a help-desk), you can enable an issue portal for your pad. - A portal is a page accessible to the public where anonymous internet users (with a - verified email address) may submit new issues to your pad. Their email address - becomes the issue owner so the requester is still able to receive updates on the - issue as well as respond with their own messages.
- -
Pads can be used by a single user or many; and pads can be owned by a user or a - user group
-
- -
- -
-
-
-
diff --git a/app/view/sysconf/stage.modal.view.php b/app/view/sysconf/stage.modal.view.php deleted file mode 100644 index 11e517f..0000000 --- a/app/view/sysconf/stage.modal.view.php +++ /dev/null @@ -1,52 +0,0 @@ - - -
-
-
-
- - - -
Pad Stages
- -
- -
-
The issue-tracking aspect of pads is divided up using pad stages. A stage is - representative of the level of completion or high-level status of an issue. For - example, a pad may have an initial stage named "To Do", an intermediate stage named - "In Progress", and another stage "In Review". Stages form a sequence in practice. - When the appropriate amount of work has been done on an issue, it is advanced to the - next stage in the pipeline. This allows other pad members and the issue's owner to - at a glance get an idea of the high-level progress of the issue.
- -
Once an issue is closed, it is removed from this stage pipeline, but retained in - the pad itself for archival purposes and for generating reports.
-
- -
- -
-
-
-
diff --git a/app/view/sysconf/user.modal.view.php b/app/view/sysconf/user.modal.view.php deleted file mode 100644 index 034dc04..0000000 --- a/app/view/sysconf/user.modal.view.php +++ /dev/null @@ -1,48 +0,0 @@ - - -
-
-
-
- - - -
User Accounts
- -
- -
-
Scrott implements a very flexible permissions and access-control system. It all - starts with users' accounts. Users can create and maintain objects and share them - with other users if they choose. This is done with a mechanism similar to unix - file permission modes. Scrott objects form a hierarchy, so permissions from 'higher' - objects will cascade down. This means that a non-trusted user may control an issue - in your pad, but have no access to the pad itself.
-
- -
- -
-
-
-
-- cgit v1.2.3 From 59cfa25b2432bbca1913fcf712eaac3c95781f6c Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 24 Jun 2017 22:28:36 -0400 Subject: Add stdpage view template --- app/view/stdpage.php | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 app/view/stdpage.php (limited to 'app/view') diff --git a/app/view/stdpage.php b/app/view/stdpage.php new file mode 100644 index 0000000..bad68f3 --- /dev/null +++ b/app/view/stdpage.php @@ -0,0 +1,65 @@ + + + + + + + + + + + Scrott<?=($title ? " - ".$title : "")?> + + + + + + + + + + + -- cgit v1.2.3 From 96a9cd59279774aea667340daaf947e3938442c7 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 24 Jun 2017 22:53:59 -0400 Subject: Remove unnessary identifier qualifiers --- app/view/stdpage.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/view') diff --git a/app/view/stdpage.php b/app/view/stdpage.php index bad68f3..157dc1b 100644 --- a/app/view/stdpage.php +++ b/app/view/stdpage.php @@ -53,13 +53,13 @@ require_once "class/globals.php"; Scrott<?=($title ? " - ".$title : "")?> - + - - + + -- cgit v1.2.3 From a43a50190fe20cb3b41498eef4a4b7c34b197c8f Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Mon, 26 Jun 2017 00:09:37 -0400 Subject: Add basic form control templates --- app/view/formctrl.php | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 app/view/formctrl.php (limited to 'app/view') diff --git a/app/view/formctrl.php b/app/view/formctrl.php new file mode 100644 index 0000000..deac491 --- /dev/null +++ b/app/view/formctrl.php @@ -0,0 +1,32 @@ + + + +
+ + /> +
+ + + +
+ + /> +
+ -- cgit v1.2.3 From b5b8c3b6d23871a289b4184d77a8bfc1608b80aa Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Mon, 26 Jun 2017 02:08:08 -0400 Subject: Add page markup for database setup --- app/view/dbconfig.php | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 app/view/dbconfig.php (limited to 'app/view') diff --git a/app/view/dbconfig.php b/app/view/dbconfig.php new file mode 100644 index 0000000..2cfd0f1 --- /dev/null +++ b/app/view/dbconfig.php @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + +
+
+
+     +     +     +     +     +     +
+ +
Welcome to Scrott!
+
+ +
You're seeing this page because the file "dbconfig.php" is missing.
+
Please fill out the form below to configure Scrott to use your database.
+
+ +
This form will save your database parameters to the configuration file.
+ Scrott needs this information before it can begin working!
+ +
+ It is presumed that you are the administrator for this Scrott install.
+ There is a security risk involved with exposing this page to the public! +
+ +
+
+ +
+
+
+
+ + + + + + + +
+
+
+
+ +
+
+
+
+ + + + -- cgit v1.2.3 From c8d6725f2dfb378c744c569df1b9981623808c87 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Tue, 27 Jun 2017 01:26:33 -0400 Subject: Reformat view helper modules To limit whitespace being piped to the client, remove empty lines of free HTML between PHP functions defined in view files. To maintain readability, this spacing is added back at the top and bottom of each PHP function. --- app/view/formctrl.php | 5 ++++- app/view/stdpage.php | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'app/view') diff --git a/app/view/formctrl.php b/app/view/formctrl.php index deac491..ee0243f 100644 --- a/app/view/formctrl.php +++ b/app/view/formctrl.php @@ -18,15 +18,18 @@ namespace formctrl; +
/>
- + +
/>
+ diff --git a/app/view/stdpage.php b/app/view/stdpage.php index 157dc1b..4bdc0c5 100644 --- a/app/view/stdpage.php +++ b/app/view/stdpage.php @@ -17,7 +17,6 @@ namespace stdpage; require_once "class/globals.php"; ?> - +
+
+ +
+ + + + + + + + + + + 18) { ?> + + +
+ +
+ + + + + + + + + + + 18) { ?> + + +
+ +
+ + + + + + + + + + + 18) { ?> + + +
+ +
+ + + + + + + + + + + 18) { ?> + + +
+
+
+ + + -- cgit v1.2.3 From d8b715d86069f247853565a2fde83d2846e853b0 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Thu, 26 Jul 2018 05:00:27 -0400 Subject: Add "My Groups" page --- app/view/groups.php | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 app/view/groups.php (limited to 'app/view') diff --git a/app/view/groups.php b/app/view/groups.php new file mode 100644 index 0000000..dadb61e --- /dev/null +++ b/app/view/groups.php @@ -0,0 +1,55 @@ + + + + + + + + + + + + + +
+
+
+ My Groups + + +
+
+ + getGroups_ordByOwnByName())) { ?> +
+
You aren't part of any groups
+
+ + + getGroups_ordByOwnByName() as $g) { ?> + + +
+ + + + -- cgit v1.2.3 From 28a49bd9688640a3682c7eb5f643155a146b2824 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Fri, 7 Sep 2018 03:46:58 -0400 Subject: Include bootstrap-select from std page --- app/view/stdpage.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/view') diff --git a/app/view/stdpage.php b/app/view/stdpage.php index 5bcf744..478c414 100644 --- a/app/view/stdpage.php +++ b/app/view/stdpage.php @@ -66,6 +66,7 @@ require_once "view/datamods.php"; Scrott<?=($title ? " - ".$title : "")?> +