Skip to content

Egor Iuganov / website

Go to a project
Commit b6f85a73 by Егор Юганов
Options

lesson 28 completed, navbar added

1 parent 121d6d28
Inline Side-by-side
Showing with 233 additions and 67 deletions
.idea/workspace.xml
...@@ -2,13 +2,10 @@ ...@@ -2,13 +2,10 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1205db3d-1d9f-4461-8852-53a7931d6ea3" name="Default" comment=""> <list default="true" id="1205db3d-1d9f-4461-8852-53a7931d6ea3" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/models.py" afterPath="$PROJECT_DIR$/music/models.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/static/music/style.css" afterPath="$PROJECT_DIR$/music/static/music/style.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/templates/music/detail.html" afterPath="$PROJECT_DIR$/music/templates/music/detail.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/templates/music/detail.html" afterPath="$PROJECT_DIR$/music/templates/music/detail.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/templates/music/index.html" afterPath="$PROJECT_DIR$/music/templates/music/index.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/templates/music/index.html" afterPath="$PROJECT_DIR$/music/templates/music/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/urls.py" afterPath="$PROJECT_DIR$/music/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/views.py" afterPath="$PROJECT_DIR$/music/views.py" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -32,11 +29,21 @@ ...@@ -32,11 +29,21 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/music/templates/music/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="detail.html" pinned="false" current-in-tab="false"> <file leaf-file-name="detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/music/templates/music/detail.html"> <entry file="file://$PROJECT_DIR$/music/templates/music/detail.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330"> <state relative-caret-position="150">
<caret line="22" column="138" lean-forward="false" selection-start-line="22" selection-start-column="138" selection-end-line="22" selection-end-column="138" /> <caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -45,19 +52,24 @@ ...@@ -45,19 +52,24 @@
<file leaf-file-name="style.css" pinned="false" current-in-tab="false"> <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/music/static/music/style.css"> <entry file="file://$PROJECT_DIR$/music/static/music/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="75">
<caret line="1" column="48" lean-forward="false" selection-start-line="1" selection-start-column="48" selection-end-line="1" selection-end-column="48" /> <caret line="5" column="11" lean-forward="false" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true"> <file leaf-file-name="base.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/music/templates/music/index.html"> <entry file="file://$PROJECT_DIR$/music/templates/music/base.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="371">
<caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <caret line="49" column="30" lean-forward="false" selection-start-line="49" selection-start-column="30" selection-end-line="49" selection-end-column="30" />
<folding /> <folding>
<element signature="e#1972#1978#0" expanded="true" />
<element signature="e#2246#2252#0" expanded="true" />
<element signature="e#2904#2910#0" expanded="true" />
<element signature="e#3119#3125#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -118,9 +130,10 @@ ...@@ -118,9 +130,10 @@
<option value="$PROJECT_DIR$/music/models.py" /> <option value="$PROJECT_DIR$/music/models.py" />
<option value="$PROJECT_DIR$/music/urls.py" /> <option value="$PROJECT_DIR$/music/urls.py" />
<option value="$PROJECT_DIR$/music/views.py" /> <option value="$PROJECT_DIR$/music/views.py" />
<option value="$PROJECT_DIR$/music/templates/music/detail.html" />
<option value="$PROJECT_DIR$/music/static/music/style.css" /> <option value="$PROJECT_DIR$/music/static/music/style.css" />
<option value="$PROJECT_DIR$/music/templates/music/index.html" /> <option value="$PROJECT_DIR$/music/templates/music/index.html" />
<option value="$PROJECT_DIR$/music/templates/music/detail.html" />
<option value="$PROJECT_DIR$/music/templates/music/base.html" />
</list> </list>
</option> </option>
</component> </component>
...@@ -198,7 +211,7 @@ ...@@ -198,7 +211,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="static" /> <option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
...@@ -345,6 +358,68 @@ ...@@ -345,6 +358,68 @@
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/music/views.py"> <entry file="file://$PROJECT_DIR$/music/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="69" lean-forward="false" selection-start-line="29" selection-start-column="69" selection-end-line="29" selection-end-column="69" />
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/templates/music/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="138" lean-forward="false" selection-start-line="22" selection-start-column="138" selection-end-line="22" selection-end-column="138" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/static/music/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="48" lean-forward="false" selection-start-line="1" selection-start-column="48" selection-end-line="1" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="51" lean-forward="false" selection-start-line="18" selection-start-column="51" selection-end-line="18" selection-end-column="51" />
<folding>
<element signature="e#24#63#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="25" lean-forward="false" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
<folding>
<element signature="e#24#63#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/templates/music/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="11" lean-forward="true" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
...@@ -458,7 +533,6 @@ ...@@ -458,7 +533,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -535,7 +609,6 @@ ...@@ -535,7 +609,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -600,7 +673,6 @@ ...@@ -600,7 +673,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -632,7 +704,6 @@ ...@@ -632,7 +704,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -681,29 +752,42 @@ ...@@ -681,29 +752,42 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/music/templates/music/detail.html"> <entry file="file://$PROJECT_DIR$/music/static/music/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330"> <state relative-caret-position="75">
<caret line="22" column="138" lean-forward="false" selection-start-line="22" selection-start-column="138" selection-end-line="22" selection-end-column="138" /> <caret line="5" column="11" lean-forward="false" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/music/static/music/style.css"> <entry file="file://$PROJECT_DIR$/music/templates/music/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="0">
<caret line="1" column="48" lean-forward="false" selection-start-line="1" selection-start-column="48" selection-end-line="1" selection-end-column="48" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="31" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/music/templates/music/index.html"> <entry file="file://$PROJECT_DIR$/music/templates/music/detail.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="150">
<caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <caret line="10" column="44" lean-forward="true" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/music/templates/music/base.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
<caret line="49" column="30" lean-forward="false" selection-start-line="49" selection-start-column="30" selection-end-line="49" selection-end-column="30" />
<folding>
<element signature="e#1972#1978#0" expanded="true" />
<element signature="e#2246#2252#0" expanded="true" />
<element signature="e#2904#2910#0" expanded="true" />
<element signature="e#3119#3125#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
music/static/music/style.css
body{ body{
background: white url("images/background.jpg"); background: white url("images/background.jpg");
}
.navbar{
border-radius: 0;
}
.navbar-brand{
font-family: 'Satisfy', cursive;
} }
\ No newline at end of file
music/templates/music/base.html 0 → 100644
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>{% block title %}Viberr{% endblock %}</title> <!--if we don't specify the title it is Viberr by default-->
<!-- Loads the path to your static files -->
{% load staticfiles %}
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"/>
<link href="https://fonts.googleapis.com/css?family=Satisfy" rel="stylesheet" type="text/css" %}"/>
<link rel="stylesheet" type="text/css" href="{% static 'music/style.css' %}"/><!--should be here so that bootstrap doesn't override our styles-->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script><!-- to make it nice when the window is small-->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
</head>
<body>
<nav class="navbar navbar-inverse"><!-- inverse to change color to black, could be default-->
<div class="container-fluid">
<!-- Header -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#topNavBar"><!-- all comes with bootstrap; topNavBar is the name of the container for all buttons on the top-->
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'music:index' %}">Viberr</a>
</div>
<!-- Items -->
<div class="collapse navbar-collapse" id="topNavBar"><!--this section is collapsable, because it also has id=topNavBar like the button above-->
<ul class="nav navbar-nav">
<li class=""> <!--if class="active" the button lookes like it's "pressed"-->
<a href="{% url 'music:index' %}">
<span class="glyphicon glyphicon-cd" aria-hidden="true"></span>&nbsp;<!-- CD-disc icon; nbsp is space -->
Albums
</a>
</li>
<li class="">
<a href="#">
<span class="glyphicon glyphicon-music" aria-hidden="true"></span>&nbsp;
Songs
</a>
</li>
</ul>
<form class="navbar-form navbar-left" role="search" method="get" action="#">
<div class="form-group">
<input type="text" class="form-control" name="q" value=""><!--q is for query-->
</div>
<button type="submit" class="btn btn-default">Search</button>
</form>
<ul class="nav navbar-nav navbar-right">
<li class="">
<a href="#">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp; Add Album
</a>
</li>
<li class="">
<a href="#">
<span class="glyphicon glyphicon-off" aria-hidden="true"></span>&nbsp; Logout
</a>
</li>
</ul>
</div>
</div>
</nav>
{% block body %} <!--here we want to include a block of code, see index.html -->
{% endblock %}
</body>
</html>
\ No newline at end of file
music/templates/music/detail.html
<img src="{{ album.album_logo }}" height="42" width="42"> {% extends 'music/base.html' %}
<h1>{{ album.album_title }}</h1>
<h2>{{ album.artist }}</h2>
<!-- <ul> {% block body %} <!--here we want to include a block of code, see index.html -->
{% for song in album.song_set.all %} <img src="{{ album.album_logo }}" height="42" width="42">
<li>{{ song.song_title }} - {{ song.file_type }}</li>
{% endfor %}
</ul> -->
{% if error_message %} <h1>{{ album.album_title }}</h1>
<p><strong>{{ error_message }}</strong></p> <h2>{{ album.artist }}</h2>
{% endif %}
<form action="{% url 'music:favorite' album.id %}" method="post"> <!-- <ul>
{% csrf_token %} {% for song in album.song_set.all %}
{% for song in album.song_set.all %} <li>{{ song.song_title }} - {{ song.file_type }}</li>
<input type="radio" id="song{{ forloop.counter }}" name="song" value="{{ song.id }}"> <!-- auto-incremented each time it prints a song --> {% endfor %}
<label for="song{{ forloop.counter }}"> </ul> -->
{{ song.song_title }}
{% if song.is_favorite %} {% if error_message %}
<img src="http://grumpygaycritic.co.uk/wp-content/uploads/2015/06/Crystal_Clear_action_bookmark.png" height="16" width="16"> <p><strong>{{ error_message }}</strong></p>
{% endif %} {% endif %}
</label><br>
{% endfor %} <form action="{% url 'music:favorite' album.id %}" method="post">
<input type="submit" value="Favorite"> {% csrf_token %}
</form> {% for song in album.song_set.all %}
\ No newline at end of file <input type="radio" id="song{{ forloop.counter }}" name="song" value="{{ song.id }}"> <!-- auto-incremented each time it prints a song -->
<label for="song{{ forloop.counter }}">
{{ song.song_title }}
{% if song.is_favorite %}
<img src="http://grumpygaycritic.co.uk/wp-content/uploads/2015/06/Crystal_Clear_action_bookmark.png" height="16" width="16">
{% endif %}
</label><br>
{% endfor %}
<input type="submit" value="Favorite">
</form>
{% endblock %}
music/templates/music/index.html
<!-- Loads the path to your static files --> {% extends 'music/base.html' %}
{% load staticfiles %}
<link rel="stylesheet" type="text/css" href="{% static 'music/style.css' %}" />
{% if all_albums %} {% block body %}
<h3>Here are all my Albums</h3>
<ul> {% if all_albums %}
{% for album in all_albums %} <h3>Here are all my Albums</h3>
<li><a href="{% url 'music:detail' album.id %}">{{ album.album_title }}</a></li> <ul>
{% endfor %} {% for album in all_albums %}
</ul> <li><a href="{% url 'music:detail' album.id %}">{{ album.album_title }}</a></li>
{% else %} {% endfor %}
<h3>You don't have any albums</h3> </ul>
{% endif %} {% else %}
\ No newline at end of file <h3>You don't have any albums</h3>
{% endif %}
{% endblock %}
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!