Skip to content

M
mymusiclist
Commit c9184d58 authored by Deion Menor's avatar Deion Menor
Browse files
Options

Start transition to w3.css with new navbar

parent 1d1fb543
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 6 deletions
core/migrations/0007_auto_20171105_1849.py 0 → 100644
View file @ c9184d58
# -*- coding: utf-8 -*-
# Generated by Django 1.11.5 on 2017-11-05 10:49
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('core', '0006_auto_20171105_1453'),
]
operations = [
migrations.RenameModel(
old_name='music_entry',
new_name='MusicEntry',
),
migrations.RenameModel(
old_name='music_playlist',
new_name='MusicPlaylist',
),
migrations.RenameModel(
old_name='user_account',
new_name='UserAccount',
),
]
files/images/travis-yewell-273488.jpg 0 → 100644
View file @ c9184d58
This diff is collapsed.
templates/base.html
View file @ c9184d58
...@@ -3,11 +3,34 @@ ...@@ -3,11 +3,34 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{% block title %}MyMusicList{% endblock %}</title> <title>{% block title %}MyMusicList{% endblock %}</title>
<link rel="stylesheet" href="/files/css/mymusiclist.css"> <!-- <link rel="stylesheet" href="/files/css/mymusiclist.css"> -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
</head> </head>
<body> <body>
<header> <header>
<div class = "w3-top">
<div class="w3-bar w3-light-grey w3-xlarge">
<a href="#" class="w3-bar-item w3-button">MyMusicList</a>
<a href="{% url 'login' %}" class="w3-bar-item w3-button">Login</a>
<a href="{% url 'signup' %}" class="w3-bar-item w3-button">Sign Up</a>
<div class="w3-dropdown-hover">
<button class="w3-button">Dropdown</button>
<div class="w3-dropdown-content w3-bar-block w3-card-4">
<a href="#" class="w3-bar-item w3-button">Album</a>
<a href="#" class="w3-bar-item w3-button">Artist</a>
<a href="#" class="w3-bar-item w3-button">Song</a>
</div>
</div>
</div>
</div>
<!--
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<ul id='nav_bar'> <ul id='nav_bar'>
<li><a class="nav_bar_home" href="/">MyMusicList</a></li> <li><a class="nav_bar_home" href="/">MyMusicList</a></li>
...@@ -42,7 +65,9 @@ ...@@ -42,7 +65,9 @@
</li> </li>
<li style="float:right"><button class="nav_bar_tab"type="button" onclick="toggleWallpaper()"></button></li> <li style="float:right"><button class="nav_bar_tab"type="button" onclick="toggleWallpaper()"></button></li>
</ul> </ul>
{% endif %} {% endif %} -->
...@@ -50,8 +75,9 @@ ...@@ -50,8 +75,9 @@
<!-- FEATURED SONGS thing -->
<div class="boxified sidebar"> <!-- <div class="boxified sidebar">
{% block sidebar %} {% block sidebar %}
<h2>Featured Songs</h2> <h2>Featured Songs</h2>
<img src="/files/images/divide_edsheeran.jpeg" alt="Divide - Ed Sheeran"> <img src="/files/images/divide_edsheeran.jpeg" alt="Divide - Ed Sheeran">
...@@ -62,9 +88,7 @@ ...@@ -62,9 +88,7 @@
Rockstar Rockstar
{% endblock %} {% endblock %}
</div> </div>
</header> </header> -->
...@@ -97,6 +121,7 @@ ...@@ -97,6 +121,7 @@
{% block content %} {% block content %}
{% endblock %} {% endblock %}
<script> <script>
......
templates/home.html
View file @ c9184d58
...@@ -29,6 +29,8 @@ MyMusicList is the answer. ...@@ -29,6 +29,8 @@ MyMusicList is the answer.
</p> </p>
</div> </div>
<div class="img-container"> <div class="img-container">
<img src="/files/images/image4.png" /> <img src="/files/images/image4.png" />
<p>“S.S. Integration”</br> <p>“S.S. Integration”</br>
...@@ -47,6 +49,11 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce vel tristique ris ...@@ -47,6 +49,11 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce vel tristique ris
Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris suscipit nec velit non egestas. Quisque auctor viverra urna, at euismod turpis ornare id. Aliquam pharetra purus quis dui blandit tincidunt. Quisque massa ligula, malesuada vel leo eu, accumsan vulputate nulla. Integer faucibus malesuada pharetra. Duis varius sapien sit amet justo malesuada fringilla. Integer eget ex sed urna auctor vestibulum. Aliquam sit amet molestie velit, a pretium ligula. Mauris gravida turpis vitae scelerisque finibus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris suscipit nec velit non egestas. Quisque auctor viverra urna, at euismod turpis ornare id. Aliquam pharetra purus quis dui blandit tincidunt. Quisque massa ligula, malesuada vel leo eu, accumsan vulputate nulla. Integer faucibus malesuada pharetra. Duis varius sapien sit amet justo malesuada fringilla. Integer eget ex sed urna auctor vestibulum. Aliquam sit amet molestie velit, a pretium ligula. Mauris gravida turpis vitae scelerisque finibus.
</div> </div>
<footer class="w3-container w3-teal">
<h5>Footer</h5>
<p>Footer information goes here</p>
</footer>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment