Bladeren bron

Update in Aug 2018. Adding Meta info, revise date pick in IE. and other minor change

geniusjees 6 jaren geleden
bovenliggende
commit
dcf399da57

+ 7 - 0
.gitignore

@@ -0,0 +1,7 @@
+APP_data/db.sqlite3
+checkIn/checkIn_media/qrcode/c_ID_5.png
+.idea/workspace.xml
+.idea/vcs.xml
+.idea/misc.xml
+.vscode/launch.json
+checkIn/checkIn_media/qrcode/c_ID_5.png

+ 1 - 1
.idea/Niko_Public.iml

@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.6 (Niko_env)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">

+ 1 - 1
checkIn/templates/checkIn/addon/luckydraw.html

@@ -27,7 +27,7 @@
             </div>
             <input type="submit" value="抽奖" class="btn btn-default"/>
         </form> 
-            <button value="返回" onClick="javascript :history.back(-1);" class="btn btn-default">返回</button>
+            <button value="返回" onClick="window.location.href='/checkIn/checkInDetail/?ID={{c_ID}}'" class="btn btn-default">返回</button>
         <table class="table table-striped">
             <caption>
                 <p><small>抽奖名单截至时间:{{cutoffTime}}</small></p><br />

+ 1 - 1
checkIn/templates/checkIn/index.html

@@ -9,7 +9,7 @@
 <div class="container">
     <div class="row">
         <div class="col-sm-12 col-md-12">
-            <h3>-我来签到-<br /><br />(<a href="http://www.qiandao.name">www.qiandao.name</a>)一个简单好用的在线二维码活动组织网站。</h3>
+            <h3>-我来签到-<br /><br />(<a href="http://www.qiandao.name">www.qiandao.name</a>)一个简单好用的在线二维码活动组织网站。</h3>
         </div>
     </div>
     <br />

+ 4 - 1
checkIn/templates/checkIn/layout.html

@@ -4,8 +4,11 @@
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="chrome=1" />
         <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width" />
+        <meta name="title" content="我来签到网"/>
+        <meta name="keyboards" content="一个用来签到的网站,可以用来组织活动,抽奖等,用户可以自行设计签到形式和内容"/>
+        <meta name="description" content="一个用来签到的网站,可以用来组织活动,抽奖等,用户可以自行设计签到形式和内容"/>
         {% load staticfiles %}
-        <title>{% if title %} {{title}} {% else %}^_^ -我来签到啦- ^_^{% endif %}</title>
+        <title>{% if title %} {{title}} {% else %}^_^ -我来签到- ^_^{% endif %}</title>
         <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" />
         <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
         <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>

+ 6 - 1
checkIn/templates/checkIn/user/checkIn.html

@@ -24,7 +24,12 @@
                         {% if item.type == 2 %}<input type="email" required="required" name="{{item.description}}" style="width:100%"/>{% endif %}
                         {% if item.type == 3 %}
                         <input type="date" required="required" name="{{item.description}}" id="{{item.ID}}" style="width:100%"/>
-                        <script>$(function() {$("#{{item.ID}}").datepicker();});</script>
+                        <script>
+                            var userAgent = navigator.userAgent;
+                            if (userAgent.indexOf("Trident") > -1 || userAgent.indexOf("MSIE") > -1) {
+                                $(function() {$("#{{item.ID}}").datepicker();});
+                            }
+                        </script>
                         {% endif %}
                         {% if item.type == 4 %}
                         <select name="{{item.description}}">