From 926bb13195a5253fc2516710453e0bd243c7d84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20H=C3=A4ggqvist?= Date: Wed, 15 Jan 2014 21:23:01 +0100 Subject: [PATCH 1/4] help user add devices --- odm/css/styles.css | 59 +++++++++++++++++++++++++++++++ odm/images/qrcode-latest-apk.png | Bin 0 -> 865 bytes odm/index.php | 21 +++++++++-- odm/js/scripts.js | 6 ++++ 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 odm/images/qrcode-latest-apk.png mode change 100644 => 100755 odm/index.php diff --git a/odm/css/styles.css b/odm/css/styles.css index 39653be..1ce03c0 100644 --- a/odm/css/styles.css +++ b/odm/css/styles.css @@ -192,6 +192,33 @@ font-size: 24px; font-weight: 300; } + + .new-device { + font-size:18px; + } + + .new-device img { + display:block; + } + + #new-device{ + display: none; + left: 435px; + padding: 20px; + position: absolute; + width: 125px; + font-size: 18px; + + /*Same box style as #devices-container*/ + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-shadow: 0 2px 6px rgba(0,0,0,0.3),0 -3px 8px rgba(0,0,0,0.2); + -ms-box-shadow: 0 2px 6px rgba(0,0,0,0.3),0 -3px 8px rgba(0,0,0,0.2); + -webkit-box-shadow: 0 2px 6px rgba(0,0,0,0.3),0 -3px 8px rgba(0,0,0,0.2); + box-shadow: 0 2px 6px rgba(0,0,0,0.3),0 -3px 8px rgba(0,0,0,0.2); + background-color: #fff; + } iframe { display: block; @@ -257,6 +284,38 @@ cursor: pointer; z-index: 2; } + + .button{ + min-width: 0; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + -moz-box-shadow: 0 1px 0 rgba(0,0,0,0.05); + -ms-box-shadow: 0 1px 0 rgba(0,0,0,0.05); + -webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.05); + box-shadow: 0 1px 0 rgba(0,0,0,0.05); + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: all .2s; + -moz-transition: all .2s; + -o-transition: all .2s; + transition: all .2s; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + background-color: #fff; + border: 1px solid rgba(0,0,0,0.17); + color: #737373; + cursor: pointer; + display: inline-block; + font: normal 500 14px "Roboto",serif; + line-height: 37px; + min-width: 40px; + padding: 0 20px; + text-decoration: none; + white-space: nowrap; + } #command-dropdown { -moz-border-radius: 3px; diff --git a/odm/images/qrcode-latest-apk.png b/odm/images/qrcode-latest-apk.png new file mode 100644 index 0000000000000000000000000000000000000000..62190f0916ece44ccccb0e203e7ec23702b317ea GIT binary patch literal 865 zcmeAS@N?(olHy`uVBq!ia0vp^`5?@}1SE5pbD9Gw=3*z$5DpHG+YkL80J)q69+AZi z4BSE>%y{W;-5;P57Ec$)kcv5P=br6*qQJvuzPk2*_`98j3sZkCUl45_dYp5@7j^3! z32NtGfBmH_P;dX2;lJoA&qcFTz{LM=_O|DZB@0w7iU9t&+gw%2UwagLh#zn0!o>&%+uGH;(o<;S|r@{I@9d*^zcv#tqD*_AyT zXy&9(Ulgy*nYS}!7i-@(kTvYKwv#o#Yw*tCWYE~+D|A)Gv+~yk)25fDv8T4Y{F^Fo zknqEMD@eT4rgn$PUJ1Po!7RmArNOzAT}(aa6))7;r}=GS^pp!A_bk~qzb;XKjY*N3 z&in)`ke;; z`&)n^e6c!nuGWiri51(nJYV>uF$^3Y%bs6m{w{g$<>4B07sn9`Axjn?-@U4F+a<*WBbBa z$>m@dWS)EZJgM}Rg!i*JNw3vqV5N6{%r~yM_!1a)Z6Dp{&)O^1{a-IdZ+qsxm zS6`*S6I}rI`N8}hJf{PUze};b-J5E@_`5gI_UpBWRbRyI61l(~b>?#Z;#n&5f3|tE zt%}I2n6ph}bp|M*6g`&KV_X`!Pdt!+`x|e#&|afGXGCIV?eIQ+sal^A?CHFk!%v@` x=q}c5zW7@em?$6A{nB>(>(1~8K_c)I$ztaD0e0sw}HmgxWh literal 0 HcmV?d00001 diff --git a/odm/index.php b/odm/index.php old mode 100644 new mode 100755 index 6548a20..434a55f --- a/odm/index.php +++ b/odm/index.php @@ -19,6 +19,11 @@ ?>
+
+ Add new device + qrcode latset apk +
Done
+
0) { @@ -48,6 +53,13 @@ $dropdown .= '
'; $count++; } + + //Dropdown entry for adding new device + $dropdown .= '
'; + $dropdown .= '
'; + $dropdown .= '
Add new device
'; + $dropdown .= '
'; + $dropdown .= '
'; ?>
@@ -130,7 +142,13 @@ -
No devices registered.
+
+ No devices registered. +
+ Add your first device + qrcode latset apk +
+
@@ -138,7 +156,6 @@
- Date: Sun, 26 Jan 2014 14:04:14 +0100 Subject: [PATCH 2/4] . --- odm/include/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/odm/include/config.php b/odm/include/config.php index 26cd09b..8517226 100644 --- a/odm/include/config.php +++ b/odm/include/config.php @@ -5,7 +5,7 @@ */ $DB_HOST = "localhost"; $DB_USER = "root"; - $DB_PASSWORD = ""; + $DB_PASSWORD = "root"; $DB_DATABASE = "odm"; /* @@ -18,7 +18,7 @@ /* * Allow new user registration? */ - $ALLOW_REGISTRATIONS = false; + $ALLOW_REGISTRATIONS = true; /* * Check for new versions at login? From ed6386ee839aecd4c9fe7b32ec35738b28890020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20H=C3=A4ggqvist?= Date: Sun, 26 Jan 2014 14:05:06 +0100 Subject: [PATCH 3/4] . --- odm/login.php | 0 odm/register.php | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 odm/login.php mode change 100644 => 100755 odm/register.php diff --git a/odm/login.php b/odm/login.php old mode 100644 new mode 100755 diff --git a/odm/register.php b/odm/register.php old mode 100644 new mode 100755 From e2fdb9dd62ed0130e2a79c031fd283b89322c039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20H=C3=A4ggqvist?= Date: Sun, 26 Jan 2014 14:19:12 +0100 Subject: [PATCH 4/4] . --- odm/checkversion.php | 0 odm/delete.php | 0 odm/img.php | 0 odm/logout.php | 0 odm/messages.php | 0 odm/send_message.php | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 odm/checkversion.php mode change 100644 => 100755 odm/delete.php mode change 100644 => 100755 odm/img.php mode change 100644 => 100755 odm/logout.php mode change 100644 => 100755 odm/messages.php mode change 100644 => 100755 odm/send_message.php diff --git a/odm/checkversion.php b/odm/checkversion.php old mode 100644 new mode 100755 diff --git a/odm/delete.php b/odm/delete.php old mode 100644 new mode 100755 diff --git a/odm/img.php b/odm/img.php old mode 100644 new mode 100755 diff --git a/odm/logout.php b/odm/logout.php old mode 100644 new mode 100755 diff --git a/odm/messages.php b/odm/messages.php old mode 100644 new mode 100755 diff --git a/odm/send_message.php b/odm/send_message.php old mode 100644 new mode 100755