From ff0d4285993fc839636fbd3a9e170bd5c4849dbe Mon Sep 17 00:00:00 2001 From: joelsalisbury Date: Wed, 30 Nov 2016 12:43:56 -0500 Subject: [PATCH 1/8] testing bkite --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8515aee..811b11a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # ABXinRLS -Antibiotics in Resource Limited Settings (CCMC) +Antibiotics in Resource Limited Settings (CCMC). Typing some stuff to test BK. \ No newline at end of file From 421c5b3dec75986b8bba5f0d14d9ae61ee90973d Mon Sep 17 00:00:00 2001 From: joelsalisbury Date: Wed, 30 Nov 2016 12:53:41 -0500 Subject: [PATCH 2/8] added db schema --- ccmc_antibiotics.xml | 79 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 ccmc_antibiotics.xml diff --git a/ccmc_antibiotics.xml b/ccmc_antibiotics.xml new file mode 100644 index 0000000..f98d1c4 --- /dev/null +++ b/ccmc_antibiotics.xml @@ -0,0 +1,79 @@ + + + + + + + + + CREATE TABLE `antibiotic` ( + `id` int(11) NOT NULL, + `name` varchar(255) NOT NULL, + `notes` text NOT NULL, + PRIMARY KEY (`id`) + ) ENGINE=InnoDB DEFAULT CHARSET=latin1; + + + CREATE TABLE `diagnosis` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `notes` text NOT NULL, + PRIMARY KEY (`id`) + ) ENGINE=InnoDB DEFAULT CHARSET=latin1; + + + CREATE TABLE `diagnosis_antibiotic` ( + `id` int(11) NOT NULL, + `diagnosis_id` int(11) NOT NULL, + `antibiotic_id` int(11) NOT NULL, + `rank` enum('1','2','3') NOT NULL, + PRIMARY KEY (`id`), + KEY `diagnosis_id` (`diagnosis_id`,`antibiotic_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=latin1; + + + CREATE TABLE `diagnosis_organism` ( + `id` int(11) NOT NULL, + `diagnosis_id` int(11) NOT NULL, + `organism_id` int(11) NOT NULL, + `notes` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `diagnosis_id` (`diagnosis_id`), + KEY `organism_id` (`organism_id`), + CONSTRAINT `diagnosis_organism_ibfk_1` FOREIGN KEY (`diagnosis_id`) REFERENCES `diagnosis` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `diagnosis_organism_ibfk_2` FOREIGN KEY (`organism_id`) REFERENCES `organism` (`id`) ON DELETE CASCADE ON UPDATE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + + + CREATE TABLE `organism` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `classification` enum('GP','GN','AE','') NOT NULL, + PRIMARY KEY (`id`) + ) ENGINE=InnoDB DEFAULT CHARSET=latin1; + + + + + + + + + + + + + \ No newline at end of file From 97b1c1e3976f3141a679682512dc60d6f1002fd4 Mon Sep 17 00:00:00 2001 From: joelsalisbury Date: Wed, 7 Dec 2016 10:49:35 -0500 Subject: [PATCH 3/8] added sample object and API file. --- api/antibiotic.php | 3 +++ api/database.php | 25 +++++++++++++++++++++++ api/diag_info.php | 11 ++++++++++ api/diagnosis.php | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+) create mode 100644 api/antibiotic.php create mode 100644 api/database.php create mode 100644 api/diag_info.php create mode 100644 api/diagnosis.php diff --git a/api/antibiotic.php b/api/antibiotic.php new file mode 100644 index 0000000..013b9c1 --- /dev/null +++ b/api/antibiotic.php @@ -0,0 +1,3 @@ +setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + + return $database; +} \ No newline at end of file diff --git a/api/diag_info.php b/api/diag_info.php new file mode 100644 index 0000000..718ffbf --- /dev/null +++ b/api/diag_info.php @@ -0,0 +1,11 @@ +"; +print_r($diag->get()); +echo ""; \ No newline at end of file diff --git a/api/diagnosis.php b/api/diagnosis.php new file mode 100644 index 0000000..caf106f --- /dev/null +++ b/api/diagnosis.php @@ -0,0 +1,50 @@ +prepare( "SELECT * from diagnosis WHERE id = :id " ); // return all fields (*) from the table WHERE the id is the var $id passed to the function + $query->bindParam( ':id', $id ); + $query->execute(); // Run the SQL query on our database + $query->setFetchMode( PDO::FETCH_OBJ ); // A PHP method to tell the database we want to return all the data as objects with each table represented as a property of that object. This will be the case for most of our calls that return information from the database. http://php.net/manual/en/pdo.constants.php + $data = $query->fetchAll(); + + $data = $data[0]; + + // Build our local object + $this->id = $data->id; + $this->name = $data->name; + $this->notes = $data->notes; + $this->buildRelatedAntibiotics(); + } + } + + private function buildRelatedAntibiotics () { + $db = getDatabase(); + $query = $db->prepare( "SELECT * from diagnosis_antibiotic WHERE diagnosis_id = :id " ); // return all fields (*) from the table WHERE the id is the var $id of current diagnosis + $query->bindParam( ':id', $this->id ); + $query->execute(); // Run the SQL query on our database + $query->setFetchMode( PDO::FETCH_OBJ ); + $data = $query->fetchAll(); + + + $this->relatedAntibiotics = $data; + } + + public function get () { + $res['id'] = $this->id; + $res['name'] = $this->name; + $res['notes'] = $this->notes; + $res['relatedAntibiotics'] = $this->relatedAntibiotics; + + return $res; + } + +} \ No newline at end of file From 91d83f773ade8dfa143c64df0fff44b772011615 Mon Sep 17 00:00:00 2001 From: joelsalisbury Date: Wed, 7 Dec 2016 13:17:04 -0500 Subject: [PATCH 4/8] yaay --- api/antibiotic.php | 36 +++++++++++++++++++++++++++++++++++- api/diagnosis.php | 20 +++++++++++++------- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/api/antibiotic.php b/api/antibiotic.php index 013b9c1..260ca6f 100644 --- a/api/antibiotic.php +++ b/api/antibiotic.php @@ -1,3 +1,37 @@ prepare( "SELECT * from antibiotic WHERE id = :id " ); // return all fields (*) from the table WHERE the id is the var $id passed to the function + $query->bindParam( ':id', $id ); + $query->execute(); // Run the SQL query on our database + $query->setFetchMode( PDO::FETCH_OBJ ); // A PHP method to tell the database we want to return all the data as objects with each table represented as a property of that object. This will be the case for most of our calls that return information from the database. http://php.net/manual/en/pdo.constants.php + $data = $query->fetchAll(); + + $data = $data[0]; + + // Build our local object + $this->id = $data->id; + $this->name = $data->name; + $this->notes = $data->notes; + } + } + + + public function get () { + $res['id'] = $this->id; + $res['name'] = $this->name; + $res['notes'] = $this->notes; + + return $res; + } + +} \ No newline at end of file diff --git a/api/diagnosis.php b/api/diagnosis.php index caf106f..36a52b5 100644 --- a/api/diagnosis.php +++ b/api/diagnosis.php @@ -1,5 +1,6 @@ prepare( "SELECT * from diagnosis_antibiotic WHERE diagnosis_id = :id " ); // return all fields (*) from the table WHERE the id is the var $id of current diagnosis + $query = $db->prepare( "SELECT antibiotic_id from diagnosis_antibiotic WHERE diagnosis_id = :id " ); // return all fields (*) from the table WHERE the id is the var $id of current diagnosis $query->bindParam( ':id', $this->id ); $query->execute(); // Run the SQL query on our database $query->setFetchMode( PDO::FETCH_OBJ ); $data = $query->fetchAll(); - - $this->relatedAntibiotics = $data; + foreach ($data as $row) { + $anti = new Antibiotic($row->antibiotic_id); + $this->relatedAntibiotics[] = $anti->get(); + } } - public function get () { + public function get() { $res['id'] = $this->id; $res['name'] = $this->name; $res['notes'] = $this->notes; $res['relatedAntibiotics'] = $this->relatedAntibiotics; - return $res; } + public function getRelatedAntibiotics() { + return $this->relatedAntibiotics; + } + } \ No newline at end of file From c190048bc15f125fd5a45e6f37c46271f4315a80 Mon Sep 17 00:00:00 2001 From: joelsalisbury Date: Wed, 7 Dec 2016 13:57:43 -0500 Subject: [PATCH 5/8] reconfigured api a bit --- api/diag_info.php | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 api/diag_info.php diff --git a/api/diag_info.php b/api/diag_info.php deleted file mode 100644 index 718ffbf..0000000 --- a/api/diag_info.php +++ /dev/null @@ -1,11 +0,0 @@ -"; -print_r($diag->get()); -echo ""; \ No newline at end of file From 8a317b4fc41c7ca956f82a918a5ceb492313102d Mon Sep 17 00:00:00 2001 From: joelsalisbury Date: Wed, 7 Dec 2016 13:58:35 -0500 Subject: [PATCH 6/8] sigh --- api/index.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 api/index.php diff --git a/api/index.php b/api/index.php new file mode 100644 index 0000000..fcb75a1 --- /dev/null +++ b/api/index.php @@ -0,0 +1,48 @@ +get()); + + + break; + + + case 'getAllDiagnoses': + + $db = getDatabase(); + + $query = $db->prepare( "SELECT id, name from diagnosis" ); + $query->execute(); + $query->setFetchMode( PDO::FETCH_OBJ ); + $data = $query->fetchAll(); + + prepareResponse($data); + + + break; + + } +} else { + die("You need to specify an operation."); +} + + + + +function prepareResponse( $arr ) { + echo json_encode( $arr ); +} \ No newline at end of file From 9300fc9aa3d07f4bee3355840ef6c356b067888f Mon Sep 17 00:00:00 2001 From: elizabethcaron Date: Thu, 8 Dec 2016 16:10:28 -0500 Subject: [PATCH 7/8] 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 From caa9572379b1f0b6f46039d1f367e31ee356a3fd Mon Sep 17 00:00:00 2001 From: Miguel Seclen Date: Sat, 10 Dec 2016 12:59:46 -0500 Subject: [PATCH 8/8] added custom css --- antibiotic.html | 61 ++++++++++++++++---------- css/main.css | 113 +++++++++++++++++++++++++++++++++++++++++++++++- diagnosis.html | 78 +++++++++++++++++++-------------- organism.html | 80 +++++++++++++++++++--------------- 4 files changed, 238 insertions(+), 94 deletions(-) diff --git a/antibiotic.html b/antibiotic.html index 5d75061..2e08c1d 100644 --- a/antibiotic.html +++ b/antibiotic.html @@ -10,6 +10,8 @@ + @@ -20,37 +22,43 @@
-

ABXinRLS

 +
+

ABXinRLS

+
+
+ + account_circle + +
-
+
-
- - User - -
-
+

Antibiotic Name

-
+
-

Antibiotic Notes

+
+

+ Antibiotic Notes +

+
Antibiotic Content Info
@@ -60,58 +68,63 @@
-
+

Related Diagnosis List

-
Diagnosis Result 1
+
Diagnosis Result 1
+ keyboard_arrow_down
-
+

Diagnosis Result 1 Information

More
-
Diagnosis Result 2
+
Diagnosis Result 2
+ keyboard_arrow_down
-
+

Diagnosis Result 2 Information

More
-
Diagnosis Result 3
+
Diagnosis Result 3
+ keyboard_arrow_down
-
+

Diagnosis Result 3 Information

More
-
Diagnosis Result 4
+
Diagnosis Result 4
+ keyboard_arrow_down
-
+

Diagnosis Result 4 Information

More
-
Diagnosis Result 5
+
Diagnosis Result 5
+ keyboard_arrow_down

Diagnosis Result 5 Information

More
-
+
- +
@@ -120,4 +133,4 @@ - \ No newline at end of file + diff --git a/css/main.css b/css/main.css index e70d938..4953695 100644 --- a/css/main.css +++ b/css/main.css @@ -1,5 +1,7 @@ +@import url('https://fonts.googleapis.com/css?family=Roboto:400,700,900'); + .page-name{ - text-align: right; + text-align: left; } .panel{ margin:auto; @@ -11,6 +13,11 @@ .classification{ text-align: right; font-style: italic; + background-color: #311B92; + color: #fff; + min-height: 3em; + margin-top: -15px; + padding: 10px; } .profile-button{ padding:60px 0 60px 0; @@ -22,4 +29,106 @@ #profile-edit{ display:block; text-align: center; -} \ No newline at end of file +} +/*headings*/ +h1 { + font-family: Roboto,sans-serif; + font-weight: 900; + color: #4527A0; +} +h2 { + font-family: Roboto,sans-serif;; + font-weight: 700; +} +/*search bar*/ +.form-control { + border-width: 0.5px; + border-radius: 2px; + box-shadow: 0 2px 2px 0 rgba(0,0,0,0.16),0 0 0 1px rgba(0,0,0,0.08); + transition: box-shadow 200ms cubic-bezier(0.4, 0.0, 0.2, 1); +} +.form-control:focus { + box-shadow: 0 3px 6px rgba(0,0,0,0.25), 0 4px 4px rgba(0,0,0,0.22); +} +.input-group.col-md-12 { + width: 100%; +} +/*button*/ +.btn-info { + background-color: #4527A0; + border-radius: 4px; +} +.btn-info:hover { + background-color: #212121; +} +.btn-info:focus { + background-color: #4527A0; +} +/*user button*/ +.user-btn { + margin-top: 0.5em; + padding: 5px 30px 1px 30px; +} +i.material-icons.md-48 { + font-size: 36px; +} +.input-group-btn { + position: absolute; + right: 30px; + top: 8px; +} +#custom-search-input button { + border: 0; + background: none; + padding: 0; + margin-top: 2px; + /* IE7-8 doesn't have border-radius, so don't indent the padding */ + margin-bottom: 0; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + color:#4527A0; + z-index: 3; +} +/*title card*/ +.page-name { + background-color: #4527A0; + color: #fff; + min-height: 5em; + padding: 4.5em 0 1em 0.5em; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.26); +} +/*panels*/ +.panel-group { + margin-bottom: 10px; +} +.panel-default>.panel-heading { + color: #fff; + background-color: #424242; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.26); + transition: all 0.3s cubic-bezier(.25,.8,.25,1); +} +.panel-default>.panel-heading:hover { + box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); +} +.abx-result { + margin: -40px 15px 0 0; + z-index: 3; +} +.panel-title { + font-family: Roboto, sans-serif; + font-weight: 400; + padding: 2.5em 0 0.5em 0; + font-size: 1.5em; +} +.panel-body a { + font-family: Roboto,sans-serif; + font-weight: 700; + color: #424242; +} +.more-link { + color: #4527A0; +} +.panel-footer { + background-color: #fff; +} diff --git a/diagnosis.html b/diagnosis.html index 6361529..1bc655d 100644 --- a/diagnosis.html +++ b/diagnosis.html @@ -10,6 +10,8 @@ + @@ -19,83 +21,89 @@ -
-

ABXinRLS

+
+

ABXinRLS

+
+
+ + account_circle + +
-
+
-
- - User - -
-
+

Diagnosis Name

- +
-
+

Antibiotics + keyboard_arrow_down

-
Antibiotic Result 1
+
Antibiotic Result 1
+ keyboard_arrow_down
-
+

Antibiotic Result 1 Information

More
-
Antibiotic Result 2
+
Antibiotic Result 2
+ keyboard_arrow_down
-
+

Antibiotic Result 2 Information

More
-
Antibiotic Result 3
+
Antibiotic Result 3
+ keyboard_arrow_down
-
+

Antibiotic Result 3 Information

More
-
Antibiotic Result 4
+
Antibiotic Result 4
+ keyboard_arrow_down
-
+

Antibiotic Result 4 Information

More
-
Antibiotic Result 5
+
Antibiotic Result 5
+ keyboard_arrow_down

Antibiotic Result 5 Information

- More - + More
-
+
@@ -107,13 +115,15 @@
-
+

Organisms + keyboard_arrow_down

-
Organism Result 1
+
Organism Result 1
+ keyboard_arrow_down

Organism Result 1 Information

@@ -122,7 +132,8 @@
-
Organism Result 2
+
Organism Result 2
+ keyboard_arrow_down

Organism Result 2 Information

@@ -131,7 +142,8 @@
-
Organism Result 3
+
Organism Result 3
+ keyboard_arrow_down

Organism Result 3 Information

@@ -139,8 +151,9 @@
- -
Organism Result 4
+ +
Organism Result 4
+ keyboard_arrow_down

Organism Result 4 Information

@@ -149,7 +162,8 @@
-
Organism Result 5
+
Organism Result 5
+ keyboard_arrow_down

Organism Result 5 Information

@@ -170,4 +184,4 @@ - \ No newline at end of file + diff --git a/organism.html b/organism.html index c395789..8302418 100644 --- a/organism.html +++ b/organism.html @@ -10,6 +10,8 @@ + @@ -20,38 +22,44 @@
-

ABXinRLS

 -
-
-
-
- - - - +
+

ABXinRLS

+
+
+ + account_circle + +
+
+
+
+
+ + + + +
-
-
- - User -
-
-
+

Organism Name

Classification

-
+
-

Organism Notes

+
+

+ Organism Notes +

+
Organism Content Info
@@ -61,58 +69,58 @@
-
+

Related Diagnosis List

-
-
Diagnosis Result 1
+
+
Diagnosis Result 1
-
+

Diagnosis Result 1 Information

- More + More
-
Diagnosis Result 2
+
Diagnosis Result 2
-
+

Diagnosis Result 2 Information

More
-
Diagnosis Result 3
+
Diagnosis Result 3
-
+

Diagnosis Result 3 Information

- <More + More
-
Diagnosis Result 4
+
Diagnosis Result 4
-
+

Diagnosis Result 4 Information

More
-
Diagnosis Result 5
+
Diagnosis Result 5

Diagnosis Result 5 Information

More
-
+
- +
@@ -121,4 +129,4 @@ - \ No newline at end of file +