Skip to content

help user add devices #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
victorhaggqvist wants to merge 4 commits into
base: master
Choose a base branch
from
Open

help user add devices #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
926bb13
help user add devices
victorhaggqvist Jan 15, 2014
f523c2f
.
victorhaggqvist Jan 26, 2014
ed6386e
.
victorhaggqvist Jan 26, 2014
e2fdb9d
.
victorhaggqvist Jan 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified odm/checkversion.php
100644 → 100755
View file
Open in desktop
Empty file.
59 changes: 59 additions & 0 deletions odm/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Empty file modified odm/delete.php
100644 → 100755
View file
Open in desktop
Empty file.
Binary file added odm/images/qrcode-latest-apk.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified odm/img.php
100644 → 100755
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions odm/include/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
$DB_HOST = "localhost";
$DB_USER = "root";
$DB_PASSWORD = "";
$DB_PASSWORD = "root";
$DB_DATABASE = "odm";

/*
Expand All @@ -18,7 +18,7 @@
/*
* Allow new user registration?
*/
$ALLOW_REGISTRATIONS = false;
$ALLOW_REGISTRATIONS = true;

/*
* Check for new versions at login?
Expand Down
21 changes: 19 additions & 2 deletions odm/index.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
?>

<div class="content-overlay-box">
<div id="new-device">
Add new device
<img src="images/qrcode-latest-apk.png" alt="qrcode latset apk">
<div class="button" onclick="toggleNewDevice()">Done</div>
</div>
<div id="devices-container">
<?php
if ($no_of_users > 0) {
Expand Down Expand Up @@ -48,6 +53,13 @@
$dropdown .= '</div>';
$count++;
}

//Dropdown entry for adding new device
$dropdown .= '<div class="device-summary" onclick="toggleNewDevice()">';
$dropdown .= ' <div class="summary-text">';
$dropdown .= ' <div class="device-registered">Add new device</div>';
$dropdown .= ' </div>';
$dropdown .= '</div>';

?>
<div>
Expand Down Expand Up @@ -130,15 +142,20 @@
<?php
} else {
?>
<div class="no-devices">No devices registered.</div>
<div class="no-devices">
No devices registered.
<div class="new-device">
Add your first device
<img src="images/qrcode-latest-apk.png" alt="qrcode latset apk">
</div>
</div>
<?php
}
?>
</div>
</div>
<div id="button" onclick="toggleCommands()"></div>
<div id="img-container"></div>

<?php
include 'include/footer.php';
dbclose();
Expand Down
6 changes: 6 additions & 0 deletions odm/js/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,3 +285,9 @@
function cancelWait() {
toggleWait();
}

function toggleNewDevice(){
if(devvis)
toggleDevices();
$('#new-device').toggle();
}
Empty file modified odm/login.php
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified odm/logout.php
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified odm/messages.php
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified odm/register.php
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified odm/send_message.php
100644 → 100755
View file
Open in desktop
Empty file.