Merge branch 'master' into feature/date_bound_adj_fe_stats

author: Chaoyi Zha <summermontreal@gmail.com> 2017-04-15 17:40:03 +0300
committer: Chaoyi Zha <summermontreal@gmail.com> 2017-04-15 17:40:03 +0300
commit: 1dfb9d021e027071bb87559d245e77ff1177e269 (patch)
tree: 594ad83fba236eb33c9f3551a06088878d7ced25 /resources
parent: c7bb9b00fa24eed9179b78e453a0c6019068927a (diff)
parent: d8dd8d6b0b622365942b3910fb2044d9ac8dc7f5 (diff)
3 files changed, 43 insertions, 14 deletions
diff --git a/resources/views/env.blade.php b/resources/views/env.blade.php
index 55da877..7bfd358 100644
--- a/resources/views/env.blade.php
+++ b/resources/views/env.blade.php
@@ -71,12 +71,21 @@ SETTING_AUTO_API={{$ST_AUTO_API}}
 # Set to true to allow anonymous API access
 SETTING_ANON_API={{$ST_ANON_API}}
 
+# Set the anonymous API quota per IP
+SETTING_ANON_API_QUOTA={{$ST_ANON_API_QUOTA}}
+
 # Set to true to use pseudorandom strings rather than using a counter by default
 SETTING_PSEUDORANDOM_ENDING={{$ST_PSEUDOR_ENDING}}
 
 # Set to true to record advanced analytics
 SETTING_ADV_ANALYTICS={{$ST_ADV_ANALYTICS}}
 
+# Set to true to restrict registration to a specific email domain
+SETTING_RESTRICT_EMAIL_DOMAIN={{$ST_RESTRICT_EMAIL_DOMAIN}}
+
+# A comma-separated list of permitted email domains
+SETTING_ALLOWED_EMAIL_DOMAINS={{$ST_ALLOWED_EMAIL_DOMAINS}}
+
 # Set each to blank to disable mail
 @if($MAIL_ENABLED)
 MAIL_DRIVER=smtp
diff --git a/resources/views/layouts/minimal.blade.php b/resources/views/layouts/minimal.blade.php
index 55539a0..65b93cb 100644
--- a/resources/views/layouts/minimal.blade.php
+++ b/resources/views/layouts/minimal.blade.php
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -->
 
 <!DOCTYPE html>
-<html>
+<html ng-app="polr">
     <head>
         <title>Polr @yield('title')</title>
         @yield('css')
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index 4115a69..c94ec85 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -14,7 +14,7 @@ Setup
     <a class="navbar-brand" href="/">Polr</a>
 </div>
 
-<div class='row'>
+<div class="row" ng-controller="SetupCtrl" class="ng-root">
     <div class='col-md-3'></div>
 
     <div class='col-md-6 setup-body well'>
@@ -39,7 +39,7 @@ Setup
 
             <p>
                 Database Name:
-                <button data-content="Name of existing database. You must create the Polr database manually." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
+                <setup-tooltip content="Name of existing database. You must create the Polr database manually."></setup-tooltip>
             </p>
             <input type='text' class='form-control' name='db:name' value='polr'>
 
@@ -85,7 +85,7 @@ Setup
 
             <p>
                 Redirect URL:
-                <button data-content="Required if you wish to redirect the index page or 404s to a different website. To use Polr, login by directly heading to yoursite.com/login first." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
+                <setup-tooltip content="Required if you wish to redirect the index page or 404s to a different website. To use Polr, login by directly heading to yoursite.com/login first."></setup-tooltip>
             </p>
             <input type='text' class='form-control' name='setting:index_redirect' placeholder='http://your-main-site.com'>
             <p class='text-muted'>
@@ -96,7 +96,7 @@ Setup
 
             <p>
                 Default URL Ending Type:
-                <button data-content="If you choose to use pseudorandom strings, you will not have the option to use a counter-based ending." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
+                <setup-tooltip content="If you choose to use pseudorandom strings, you will not have the option to use a counter-based ending."></setup-tooltip>
             </p>
             <select name='setting:pseudor_ending' class='form-control'>
                 <option value='false' selected='selected'>Use base62 or base32 counter (shorter but more predictable, e.g 5a)</option>
@@ -105,7 +105,7 @@ Setup
 
             <p>
                 URL Ending Base:
-                <button data-content="This will have no effect if you choose to use pseudorandom endings." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
+                <setup-tooltip content="This will have no effect if you choose to use pseudorandom endings."></setup-tooltip>
             </p>
             <select name='setting:base' class='form-control'>
                 <option value='32' selected='selected'>32 -- lowercase letters & numbers (default)</option>
@@ -114,7 +114,7 @@ Setup
 
             <h4>
                 Admin Account Settings
-                <button data-content="These credentials will be used for your admin account in Polr." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
+                <setup-tooltip content="These credentials will be used for your admin account in Polr."></setup-tooltip>
             </h4>
 
             <p>Admin Username:</p>
@@ -128,7 +128,7 @@ Setup
 
             <h4>
                 SMTP Settings
-                <button data-content="Required only if the email verification or password recovery features are enabled." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
+                <setup-tooltip content="Required only if the email verification or password recovery features are enabled."></setup-tooltip>
             </h4>
 
             <p>SMTP Server:</p>
@@ -156,6 +156,12 @@ Setup
                 <option value='true'>On -- empty key API requests are allowed</option>
             </select>
 
+            <p>
+                Anonymous API Quota:
+                <setup-tooltip content="API quota for non-authenticated users per minute per IP."></setup-tooltip>
+            </p>
+            <input type='text' class='form-control' name='setting:anon_api_quota' placeholder='10'>
+
             <p>Automatic API Assignment:</p>
             <select name='setting:auto_api_key' class='form-control'>
                 <option selected value='false'>Off -- admins must manually enable API for each user</option>
@@ -166,7 +172,7 @@ Setup
 
             <p>
                 Registration:
-                <button data-content="Enabling registration allows any user to create an account." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
+                <setup-tooltip content="Enabling registration allows any user to create an account."></setup-tooltip>
             </p>
             <select name='setting:registration_permission' class='form-control'>
                 <option value='none'>Registration disabled</option>
@@ -175,8 +181,23 @@ Setup
             </select>
 
             <p>
+                Restrict Registration Email Domains:
+                <setup-tooltip content="Restrict registration to certain email domains."></setup-tooltip>
+            </p>
+            <select name='setting:restrict_email_domain' class='form-control'>
+                <option value='false'>Allow any email domain to register</option>
+                <option value='true'>Restrict email domains allowed to register</option>
+            </select>
+
+            <p>
+                Permitted Email Domains:
+                <setup-tooltip content="A comma-separated list of emails permitted to register."></setup-tooltip>
+            </p>
+            <input type='text' class='form-control' name='setting:allowed_email_domains' placeholder='company.com,company-corp.com'>
+
+            <p>
                 Password Recovery:
-                <button data-content="Password recovery allows users to reset their password through email." type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>
+                <setup-tooltip content="Password recovery allows users to reset their password through email."></setup-tooltip>
             </p>
             <select name='setting:password_recovery' class='form-control'>
                 <option value='false'>Password recovery disabled</option>
@@ -186,9 +207,6 @@ Setup
                 Please ensure SMTP is properly set up before enabling password recovery.
             </p>
 
-            {{-- <p>Path relative to root (leave blank if /, if http://site.com/polr, then write /polr/):</p>
-            <input type='text' class='form-control' name='path' placeholder='/polr/' value=''> --}}
-
             <p>Theme (<a href='https://github.com/cydrobolt/polr/wiki/Themes-Screenshots'>screenshots</a>):</p>
             <select name='app:stylesheet' class='form-control'>
                 <option value=''>Modern (default)</option>
@@ -236,5 +254,7 @@ Setup
 
 @section('js')
 <script src="/js/bootstrap.min.js"></script>
-<script src='/js/setup.js'></script>
+<script src='/js/angular.min.js'></script>
+<script src='/js/base.js'></script>
+<script src='/js/SetupCtrl.js'></script>
 @endsection
author	Chaoyi Zha <summermontreal@gmail.com>	2017-04-15 17:40:03 +0300
committer	Chaoyi Zha <summermontreal@gmail.com>	2017-04-15 17:40:03 +0300
commit	1dfb9d021e027071bb87559d245e77ff1177e269 (patch)
tree	594ad83fba236eb33c9f3551a06088878d7ced25 /resources
parent	c7bb9b00fa24eed9179b78e453a0c6019068927a (diff)
parent	d8dd8d6b0b622365942b3910fb2044d9ac8dc7f5 (diff)