diff options
Diffstat (limited to 'static/website/templates')
-rw-r--r-- | static/website/templates/base.html | 14 | ||||
-rw-r--r-- | static/website/templates/filter.html | 2 | ||||
-rw-r--r-- | static/website/templates/index.html | 47 | ||||
-rw-r--r-- | static/website/templates/new-question.html | 2 | ||||
-rw-r--r-- | static/website/templates/search.html | 29 | ||||
-rw-r--r-- | static/website/templates/user-answers.html | 2 | ||||
-rw-r--r-- | static/website/templates/user-questions.html | 2 |
7 files changed, 87 insertions, 11 deletions
diff --git a/static/website/templates/base.html b/static/website/templates/base.html index b5d087b..d122679 100644 --- a/static/website/templates/base.html +++ b/static/website/templates/base.html @@ -47,17 +47,14 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= <img id="logo" src="{% static 'website/images/logo.png' %}"> FOSSEE Forums </a> + + </div> <!-- /.navbar-header --> <!-- Collect the nav links, forms, and other content for toggling --> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> - <li> - <a href="{% url 'website:search' %}"> - <span class="glyphicon glyphicon-search"></span> - Search - </a> - </li> + <li> <a href="{% url 'website:new_question' %}"> <span class="glyphicon glyphicon-pencil"></span> @@ -105,9 +102,12 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= </div> <!-- /.container --> </nav> </div> <!-- /#header-inner --> + </div> <!-- /#header-wrapper --> + + - <div id="content-wrapper"> + <div id="content-wrapper" > <div id="content-inner" class="container"> <div id="content" class="col-lg-12 col-md-12 col-sm-12"> {% block content %} diff --git a/static/website/templates/filter.html b/static/website/templates/filter.html index c64f68c..a3ff7f7 100644 --- a/static/website/templates/filter.html +++ b/static/website/templates/filter.html @@ -3,7 +3,7 @@ {% block content %} {% if questions %} -<h5> +<h5 style="padding-top: 15px;"> These are the similar questions in: diff --git a/static/website/templates/index.html b/static/website/templates/index.html index f7c3f37..53e8f95 100644 --- a/static/website/templates/index.html +++ b/static/website/templates/index.html @@ -5,8 +5,53 @@ {% load helpers %} {% block content %} + +<div style="margin-left: 450px;" > + <script> + (function() { + var cx = '011342992297670206849:dfzecvqmvgc'; + var gcse = document.createElement('script'); + gcse.type = 'text/javascript'; + gcse.async = true; + gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + + '//cse.google.com/cse.js?cx=' + cx; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(gcse, s); + })(); +</script> +<gcse:search></gcse:search> +</div> + +<style> + + .gsc-search-button + { + + border-radius: 5px; + border-color: #666; + + } + + +input.gsc-search-button, input.gsc-search-button:hover, input.gsc-search-button:focus { + + background-image: url("http://www.google.com/uds/css/v2/search_box_icon.png") !important; + background-position: 50% 50%; + background-repeat: no-repeat; + height: 28px !important; + width: 60px + + filter: none; + +} + </style> + + + <div id="carousel-container"> + <div class="carousel"> + {% for category in categories %} <div> <div class="thumbnail"> @@ -32,6 +77,8 @@ </div> <!-- /.carousel --> </div> <!-- /#carousel-container --> + + <div id="filter-container"> <div class="row"> <form class ="" id="filter-form" action="" role="form"> diff --git a/static/website/templates/new-question.html b/static/website/templates/new-question.html index cbc6063..d5f9b55 100644 --- a/static/website/templates/new-question.html +++ b/static/website/templates/new-question.html @@ -2,7 +2,7 @@ {% load static %} {% load widget_tweaks %} {% block content %} - <h4> + <h4 style="padding-top: 15px;"> <span class="glyphicon glyphicon-pencil"> </span> Create a new question . . . </h4> diff --git a/static/website/templates/search.html b/static/website/templates/search.html index 673274d..243a52f 100644 --- a/static/website/templates/search.html +++ b/static/website/templates/search.html @@ -2,6 +2,17 @@ {% load static %} {% block content %} + <style> + .gsc-search-button +{ + background-color: #C0C0C0 ; + border-radius: 5px; + + +} + + </style> + <!-- Nav tabs --> <ul class="nav nav-tabs"> <li class="active" ><a href="#search-by-keyword" data-toggle="tab">Search by Keyword</a></li> @@ -10,6 +21,23 @@ <!-- Tab panes --> <div class="tab-content"> + + <div style="float:right; margin-right: 50px; width: 400px;"> + <script> + (function() { + var cx = '011342992297670206849:dfzecvqmvgc'; + var gcse = document.createElement('script'); + gcse.type = 'text/javascript'; + gcse.async = true; + gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + + '//cse.google.com/cse.js?cx=' + cx; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(gcse, s); + })(); +</script> +<gcse:search></gcse:search> + </div> + <br> <div class="tab-pane active" id="search-by-keyword"> <div class="row"> @@ -70,3 +98,4 @@ {% block javascript %} <script src="{% static 'website/js/search.js' %}"></script> {% endblock %} + diff --git a/static/website/templates/user-answers.html b/static/website/templates/user-answers.html index 86cbd0a..f4f3920 100644 --- a/static/website/templates/user-answers.html +++ b/static/website/templates/user-answers.html @@ -1,7 +1,7 @@ {% extends 'website/templates/base.html' %} {% load count_tags %} {% block content %} - <h4>My Answers</h4> + <h4 style="padding-top: 15px;">My Answers</h4> {% for answer in answers%} <div class="my-answer"> <span class="body"> diff --git a/static/website/templates/user-questions.html b/static/website/templates/user-questions.html index 69b3b4b..0ec15ae 100644 --- a/static/website/templates/user-questions.html +++ b/static/website/templates/user-questions.html @@ -1,7 +1,7 @@ {% extends 'website/templates/base.html' %} {% load count_tags %} {% block content %} - <h4>My Questions</h4> + <h4 style="padding-top: 15px;">My Questions</h4> {% for question in questions %} <div class="my-question"> <span class="title"> |