Skip to content

Update index.php to point to objects.js instead of email.js #2

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update index.php to point to objects.js instead of email.js #2

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
5b3310d
Update index.php to point to objects.js instead of email.js
globmont Sep 29, 2014
2526fa8
Replay
volosied Dec 7, 2014
bd62b3a
hover effects implemented
volosied Dec 13, 2014
7df6867
saves log file in play folder
volosied Dec 14, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/.metadata/*
1 change: 1 addition & 0 deletions 1411750669
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Started Session on: Friday, 26-Sep-2014 18:57:49 CEST
1 change: 1 addition & 0 deletions 1412284658
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Started Session on: Thursday, 02-Oct-2014 23:17:38 CEST
1 change: 1 addition & 0 deletions 1412882134
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Started Session on: Thursday, 09-Oct-2014 21:15:34 CEST
Empty file modified README.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified config.properties
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified consent/consent.css
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified consent/consent.html
100644 → 100755
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions consent/consent.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

$start_date = date(DATE_COOKIE);
$_SESSION['log'] = "Started Session on: ".$start_date."\n";
$signatures_file= '/afs/cs.unc.edu/home/bartel/emailUI_tracking/private_data/signatures.txt';
// $signatures_file= '/afs/cs.unc.edu/home/bartel/emailUI_tracking/private_data/signatures.txt';
file_put_contents($signatures_file, "".$signature.", ".$date."=>".$id."\n" , FILE_APPEND | LOCK_EX);

header( 'Location: https://wwwp.cs.unc.edu/~bartel/cgi-bin/emailUI/EmailUI/' ) ;
header( 'Location: ../index.php' ) ;

?>
Empty file modified css/consent.css
100644 → 100755
View file
Open in desktop
Empty file.
68 changes: 66 additions & 2 deletions css/style.css
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,17 @@ width: 99%;
margin-left: 20px;
}

#poke{
margin-top: 5px;
}

#reply{
margin-top: 5px;
}

#navigation {
margin: 0px 40px 0px 10px;
margin: 0px auto 0px 10px;
min-width: 100px;
}

#new_message_editor {
Expand Down Expand Up @@ -55,11 +64,20 @@ color: #FFFF80;
}

#predictions {
display: none;
width: 100%;
padding-bottom:10px;
}

.longResponse{
color:red;
padding-right: 5px;
}
.fastResponse{
color:green;
padding-right: 5px;

}

#prediction_menu_options {
margin:0px 0px 10px 20px;
}
Expand Down Expand Up @@ -155,7 +173,53 @@ input#to_field:focus {
background-color: #DAEDF5;
}

.contact{
background-color: #FF9900;
}

.contact:hover {
cursor: pointer;
background-color: #993300;
}

textarea {
resize: none;
}

#replayMenu{
position: absolute;
top: 20px;
left: 310px;
}

#title{
float: left;
}

.replay{
float: left;
display: inline-block;
margin-left: 20px;
text-align: center;
}

.replay:hover, .replayHover{
color: red;
}

#time{
width: 20px;
}

#stats{
position: absolute;
top: 30px;
left: 620px;
}

.btn-select{
margin: 0px auto 0px auto;
background-color: #3690ce;
color: white;
min-width: 60px;
}
Empty file modified html/consent.css
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified html/consent.html
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified html/login.html
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified html/quit.html
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified html/thankyou.html
100644 → 100755
View file
Open in desktop
Empty file.
74 changes: 57 additions & 17 deletions index.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
session_start();
if (!isset($_SESSION['id'])) {
header("Location: https://wwwp.cs.unc.edu/~bartel/cgi-bin/emailUI/EmailUI/consent/consent.html");
header("Location: consent/consent.html");
}

//fetch the test data
Expand All @@ -16,7 +16,7 @@
$log_file = $log_url.$_SESSION["id"];
$result = file_put_contents($log_file, $_SESSION["log"]);
session_destroy();
header("Location: https://wwwp.cs.unc.edu/~bartel/cgi-bin/emailUI/EmailUI/html/thankyou.html");
header("Location: html/thankyou.html");
}

else
Expand Down Expand Up @@ -50,9 +50,22 @@
<div id="container">

<div class = "row" id="header">
<div class="col-md-12">
<div id='title'>
<h2> Email Prediction Test </h2>
<div id='replayMenu'>
<input type="button" id="get_file" value="Grab file">
<input type="file" id="my_file">
<!-- <button class='btn-sm replay' onclick='startReplay()'> Play New </button>-->
<button class='btn-sm replay' onclick='stop()'> Stop </button>
<button class='btn-sm replay'onclick='restart()'> Restart </button>
<button class='btn-sm replay' onclick='hide()'> Hide </button>
</div>
<div id='stats'>
<div class='replay'> Time : <span id='time'> 0.00 </span> sec </div>
<div class='replay'> Button Clicks : <span id='btn_clicks'> 0 </span> </div>
<div class='replay'> Key Strokes : <span id='key_stokes'> 0 </span> </div>
</div>
</div>
<div class="modal fade" id="instructions" role="dialog" tab-index="-1">
<div class="modal-dialog">
<div class="modal-content">
Expand All @@ -63,7 +76,25 @@
<p></p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Begin Test</button>
<button type="button" class="btn btn-select tracked click" data-dismiss="modal" id="timeNparen">Time and Prediction</button>
<button type="button" class="btn btn-select tracked click" data-dismiss="modal" id="paren">Prediction</button>
<button type="button" class="btn btn-select tracked click" data-dismiss="modal" id="time">Time</button>
<button type="button" class="btn btn-select tracked click" data-dismiss="modal" id="flat">Neither</button>
</div>
</div>
</div>
</div><!-- /.modal -->

<div class="modal fade" id="popup_instr" role="dialog" tab-index="-1">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title">Instructions</h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -91,7 +122,10 @@
<button type="button" class="btn btn-default tracked click" id="nav_new_message">New Message</button>
<button type="button" class="btn btn-default tracked click" id="nav_inbox">Inbox</button>
<button type="button" class="btn btn-default tracked click" id="nav_sent">Sent</button>
<button type="button" class="btn btn-default tracked click" id="play" onclick="showReplay()"> Replay</button>
<button type="button" class="btn btn-default tracked click" id="nav_contacts">Contacts</button>
<button type="button" class="btn btn-default tracked click" id="nav_trash">Trash</button>
<button type="button" class="btn btn-default tracked click" id="nav_instructions">Instructions</button>
<button type="button" class="btn btn-warning tracked click" id="save_session">Quit and Save</button>
<button type="button" class="btn btn-danger tracked click" id="end_session">Quit</button>
</div>
Expand All @@ -102,6 +136,12 @@
<ul class="list-group"></ul>
</div>
</div>

<!--<div class ="col-md-10" id="contact_list">
<div class="panel panel-default">
<ul class="contact-group"></ul>
</div>
</div>-->

<div class ="col-md-10" id="email_expanded_col">
<div class="panel panel-default" id="email_expanded">
Expand All @@ -115,21 +155,20 @@
<div class ="panel panel-default" id="new_message_editor">
<div class="panel-heading">New Message</div>
<div class="panel-body">
<span class="form-control" id="to_field_outer">
<table>
<tr>
<td><div id="contact_box"></div></td>

<td><input type="text" id="to_field" placeholder="To" autofocus><br></td>
<tr>
</table>
</span>
<span class="form-control" id="to_field_outer">
<table>
<tr>
<td><div id="contact_box"></div></td>
<td><input type="text" class='tracked click text' id="to_field" placeholder="To" autofocus><br></td>
<tr>
</table>
</span>
<div id="predictions">
</div>
<input type="text" class="form-control tracked text" id="cc_field" placeholder="Cc"><br>
<input type="text" class="form-control tracked text" id="subect_field" placeholder="Subject">
<input type="text" class="form-control tracked text click" id="cc_field" placeholder="Cc"><br>
<input type="text" class="form-control tracked text click" id="subect_field" placeholder="Subject">
<br>
<textarea rows="12" class ="form-control tracked text" id="message_field" placeholder="Write your message here"></textarea>
<textarea rows="12" class ="form-control tracked text click" id="message_field" placeholder="Write your message here"></textarea>
<div id="new_message_options">
<button type="button" class="btn btn-success tracked click" id="send"> Send </button>
<button type="button" class="btn btn-warning tracked click" id="save"> Save Draft</button>
Expand All @@ -144,8 +183,9 @@
<script src="libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
<script src="libs/Bootstrap/js/bootstrap.min.js"></script>

<script src="js/email.js"></script>
<script src="js/objects.js"></script>
<script src="js/main.js"></script>
<script src='play/replay.js'></script>

</body>
</html>
Loading