diff options
| author | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-27 01:45:51 +0000 |
|---|---|---|
| committer | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-27 01:45:51 +0000 |
| commit | ef5d0e0304cea09fdd67745153e617b197667479 (patch) | |
| tree | 56d7dec49415f2bb353e4628bad890a3990895fd /views | |
| parent | 3b002a6fb136b9e7e534ffbcfedabed72fcd373d (diff) | |
| parent | 7180bb0605e490b789d946aa64f8f678cbf13f00 (diff) | |
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
Diffstat (limited to 'views')
| -rw-r--r-- | views/layouts/layout.hbs | 7 | ||||
| -rw-r--r-- | views/questions.hbs | 25 |
2 files changed, 29 insertions, 3 deletions
diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs index 62e9134..b9895a5 100644 --- a/views/layouts/layout.hbs +++ b/views/layouts/layout.hbs @@ -17,13 +17,16 @@ <!--Fonts--> <link href='https://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'> - <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous"> - + <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" + rel="stylesheet" + integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" + crossorigin="anonymous"> <!--JS--> <script src="/assets/js/jquery-2.2.4.min.js"></script> <script src="/assets/js/bootstrap.min.js"></script> <script src="/assets/js/script.js"></script> + </head> <body> {{> header }} diff --git a/views/questions.hbs b/views/questions.hbs index 4b40d33..1d62a2b 100644 --- a/views/questions.hbs +++ b/views/questions.hbs @@ -1,7 +1,30 @@ <main id = 'solutions-main'> <div class = 'search container' id = 'solutions-div'> - <!-- EXAM DETAILS --> + <!-- EXAM DETAILS --> + {{# if messages.error }} + <section class="alert alert-danger custom-Alert"> + <h4>{{ messages.error }}</h4> + </section> + {{/if}} + + <form action="/user/follow_exam/{{examInfo.id}}" method = 'post'> + <input type="hidden" name="_csrf" value="{{ csrfToken }}"> + <button class="col-xs-4 col-sm-2 col-md-2 col-lg-2 + col-xs-offset-4 col-sm-offset-5 col-md-offset-2 + col-lg-offset-2 rounded" id="add-solution" type="submit"> + <h3>Follow Exam</h3> + </button> + </form> + + <!--<a href="/user/follow_exam/{{../examInfo.id}}">--> + <!--<button class="col-xs-4 col-sm-2 col-md-2 col-lg-2--> + <!--col-xs-offset-4 col-sm-offset-5 col-md-offset-2--> + <!--col-lg-offset-2 rounded" id="add-solution">--> + <!--<h3>Follow Exam</h3>--> + <!--</button>--> + <!--</a>--> + <a href="http://www.cs.toronto.edu/~fpitt/CSC148/20131/tests/test1-0101.pdf" target='_blank'><img src="/assets/images/exam.png" class='exam-img img-responsive exam-info'></a> |