From 9300fc9aa3d07f4bee3355840ef6c356b067888f Mon Sep 17 00:00:00 2001 From: elizabethcaron Date: Thu, 8 Dec 2016 16:10:28 -0500 Subject: [PATCH] added add diagnosis, add organism, add user, login, index, profile edit pages-- needs styling --- add-diagnosis.html | 75 ++++++++++++++++++++++++++ add-organism.html | 62 +++++++++++++++++++++ add-user.html | 64 ++++++++++++++++++++++ antibiotic.html | 4 ++ css/main.css | 92 +++++++++++++++++++++++++++++++ diagnosis.html | 10 ++-- index.html | 127 ++++--------------------------------------- js/main.js | 43 +++++++++++++++ login.html | 62 +++++++++++++++++++++ organism.html | 11 ++-- profile-edit.html | 132 +++++++++++++++++++++++++++++++++++++++++++++ user.html | 12 +++-- 12 files changed, 566 insertions(+), 128 deletions(-) create mode 100644 add-diagnosis.html create mode 100644 add-organism.html create mode 100644 add-user.html create mode 100644 js/main.js create mode 100644 login.html create mode 100644 profile-edit.html diff --git a/add-diagnosis.html b/add-diagnosis.html new file mode 100644 index 0000000..4473022 --- /dev/null +++ b/add-diagnosis.html @@ -0,0 +1,75 @@ + + + + + + + + ABXinRLS + + + + + + + + + + + +
+

ABXinRLS

 + +

Add Diagnosis

+ +
+
+ + +
+
+ + + +
+
+
+
Classification
+ + + Gram-positive + +
    +
  • Gram-positive
    • +
  • Gram-negative
    • +
  • Anaerobic
    • +
+ +
+
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/add-organism.html b/add-organism.html new file mode 100644 index 0000000..d4bf894 --- /dev/null +++ b/add-organism.html @@ -0,0 +1,62 @@ + + + + + + + + ABXinRLS + + + + + + + + + + + +
+

ABXinRLS

 + +

Add Organism

+ +
+
+ + +
+
+ + + +
+ + + +
+ + + + + + + +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/add-user.html b/add-user.html new file mode 100644 index 0000000..2c118a1 --- /dev/null +++ b/add-user.html @@ -0,0 +1,64 @@ + + + + + + + + ABXinRLS + + + + + + + + + + + +
+

ABXinRLS

 + +

Add User

+ +
+
+ + +
+
+ + + +
+ + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/antibiotic.html b/antibiotic.html index 5d75061..167e906 100644 --- a/antibiotic.html +++ b/antibiotic.html @@ -21,6 +21,9 @@

ABXinRLS

 + +
+
@@ -119,5 +122,6 @@ + \ No newline at end of file diff --git a/css/main.css b/css/main.css index e70d938..9062692 100644 --- a/css/main.css +++ b/css/main.css @@ -22,4 +22,96 @@ #profile-edit{ display:block; text-align: center; +} +.form-signin{ + max-width: 330px; + padding:15px; + margin:0 auto; +} + + +/*---------------------------------- add diagnosis button ---------------------------*/ +.btn-select { + position: relative; + padding: 0; + min-width: 236px; + width: 100%; + border-radius: 0; + margin-bottom: 20px; +} + +.btn-select .btn-select-value { + padding: 6px 12px; + display: block; + position: absolute; + left: 0; + right: 34px; + text-align: left; + text-overflow: ellipsis; + overflow: hidden; + border-top: none !important; + border-bottom: none !important; + border-left: none !important; +} + +.btn-select .btn-select-arrow { + float: right; + line-height: 20px; + padding: 6px 10px; + top: 0; +} + +.btn-select ul { + display: none; + background-color: white; + color: black; + clear: both; + list-style: none; + padding: 0; + margin: 0; + border-top: none !important; + position: absolute; + left: -1px; + right: -1px; + top: 33px; + z-index: 999; +} + +.btn-select ul li { + padding: 3px 6px; + text-align: left; +} + +.btn-select ul li:hover { + background-color: #f4f4f4; +} + +.btn-select ul li.selected { + color: white; +} + +/* Default Start */ +.btn-select.btn-default:hover, .btn-select.btn-default:active, .btn-select.btn-default.active { + border-color: #ccc; +} + +.btn-select.btn-default ul li.selected { + background-color: #ccc; +} + +.btn-select.btn-default ul, .btn-select.btn-default .btn-select-value { + background-color: white; + border: #ccc 1px solid; +} + +.btn-select.btn-default:hover, .btn-select.btn-default.active { + background-color: #e6e6e6; +} +.add-button{ + display:block; + margin:0 auto; +} +.dropdown-option{ + display:block; + margin:auto; } \ No newline at end of file diff --git a/diagnosis.html b/diagnosis.html index 6361529..e33630d 100644 --- a/diagnosis.html +++ b/diagnosis.html @@ -21,12 +21,15 @@
-

ABXinRLS

+

ABXinRLS

 + +
+
- +
- + User
@@ -169,5 +172,6 @@ + \ No newline at end of file diff --git a/index.html b/index.html index c097aae..105c16a 100644 --- a/index.html +++ b/index.html @@ -22,11 +22,19 @@

ABXinRLS

-
+ + +
+
+

CCMC

+

ANTIBIOTICS

+
+ +
- +
-
- - User - -
-
-
-
-

Diagnosis Name

- -
-
-
-
-

- Antibiotics -

-
-
-
Antibiotic Result 1
-
-
-

Antibiotic Result 1 Information

- Click for more information -
-
-
Antibiotic Result 2
-
-
-

Antibiotic Result 2 Information

- Click for more information -
-
-
Antibiotic Result 3
-
-
-

Antibiotic Result 3 Information

- Click for more information -
-
-
Antibiotic Result 4
-
-
-

Antibiotic Result 4 Information

- Click for more information -
-
-
Antibiotic Result 5
-
-
-

Antibiotic Result 5 Information

- Click for more information -
-
-
-
-
-
-
- - -
-
-
-
-
-

- Organisms -

-
-
-
Organism Result 1
-
-
-

Organism Result 1 Information

- Click for more information -
-
- -
Organism Result 2
-
-
-

Organism Result 2 Information

- Click for more information -
-
-
Organism Result 3
-
-
-

Organism Result 3 Information

- Click for more information -
-
- -
Organism Result 4
-
-
-

Organism Result 4 Information

- Click for more information -
-
- -
Organism Result 5
-
-
-

Organism Result 5 Information

- Click for more information -
-
-
-
-
-
-
-
diff --git a/js/main.js b/js/main.js new file mode 100644 index 0000000..4aa3422 --- /dev/null +++ b/js/main.js @@ -0,0 +1,43 @@ +$(document).ready(function () { + $(".btn-select").each(function (e) { + var value = $(this).find("ul li.selected").html(); + if (value != undefined) { + $(this).find(".btn-select-input").val(value); + $(this).find(".btn-select-value").html(value); + } + }); +}); + +$(document).on('click', '.btn-select', function (e) { + e.preventDefault(); + var ul = $(this).find("ul"); + if ($(this).hasClass("active")) { + if (ul.find("li").is(e.target)) { + var target = $(e.target); + target.addClass("selected").siblings().removeClass("selected"); + var value = target.html(); + $(this).find(".btn-select-input").val(value); + $(this).find(".btn-select-value").html(value); + } + ul.hide(); + $(this).removeClass("active"); + } + else { + $('.btn-select').not(this).each(function () { + $(this).removeClass("active").find("ul").hide(); + }); + ul.slideDown(300); + $(this).addClass("active"); + } +}); + +$(document).on('click', function (e) { + var target = $(e.target).closest(".btn-select"); + if (!target.length) { + $(".btn-select").removeClass("active").find("ul").hide(); + } +}); + +function goBack() { + window.history.back(); +} \ No newline at end of file diff --git a/login.html b/login.html new file mode 100644 index 0000000..b5db4e7 --- /dev/null +++ b/login.html @@ -0,0 +1,62 @@ + + + + + + + + ABXinRLS + + + + + + + + + + + +
+

ABXinRLS

 + + +
+
+

CCMC

+

ANTIBIOTICS

+ + +
+ +
+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/organism.html b/organism.html index c395789..05503c5 100644 --- a/organism.html +++ b/organism.html @@ -20,12 +20,15 @@
-

ABXinRLS

 +

ABXinRLS

 + +
+
- +
- + User
@@ -120,5 +123,7 @@ + + \ No newline at end of file diff --git a/profile-edit.html b/profile-edit.html new file mode 100644 index 0000000..0007f0e --- /dev/null +++ b/profile-edit.html @@ -0,0 +1,132 @@ + + + + + + + + ABXinRLS + + + + + + + + + + + +
+

ABXinRLS

 + +
+ + +
+

Edit Profile

+
+
+ +
+
+ avatar +
Upload a different photo...
+ + +
+
+ + +
+

Personal info

+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + +
+
+
+
+
+
+
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/user.html b/user.html index 04ac3b3..99808a6 100644 --- a/user.html +++ b/user.html @@ -20,12 +20,15 @@
-

ABXinRLS

 +

ABXinRLS

 + +
+
- +
@@ -80,13 +83,12 @@ - -
+ \ No newline at end of file