From ee4f28307318f02116260cb0ce1ca085f984cb2d Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Fri, 30 May 2014 20:45:09 +0100 Subject: [PATCH] Updated pipeline css --- dss/pipelinesettings.py | 24 ++- static/js/dss/templates/activityitemview.jst | 25 +++ static/js/dss/templates/activitylistview.jst | 11 ++ static/js/dss/templates/commentitemview.jst | 25 +++ static/js/dss/templates/commentlistview.jst | 14 ++ static/js/dss/templates/header.jst | 90 ++++++++++ static/js/dss/templates/mixdetailview.jst | 47 ++++++ static/js/dss/templates/mixeditview.jst | 149 +++++++++++++++++ static/js/dss/templates/mixitemview.jst | 157 ++++++++++++++++++ static/js/dss/templates/mixlistlayout.jst | 5 + static/js/dss/templates/mixlistview.jst | 5 + static/js/dss/templates/mixtabheaderview.jst | 10 ++ .../dss/templates/notificationsitemview.jst | 13 ++ .../dss/templates/notificationslistview.jst | 11 ++ static/js/dss/templates/nowplaying.jst | 30 ++++ static/js/dss/templates/search.jst | 15 ++ static/js/dss/templates/searchresultview.jst | 16 ++ static/js/dss/templates/sidebarview.jst | 4 + static/js/dss/templates/usereditview.jst | 125 ++++++++++++++ static/js/dss/templates/useritemview.jst | 110 ++++++++++++ static/js/dss/templates/userlistview.jst | 12 ++ static/js/dss/templates/userprofileview.jst | 135 +++++++++++++++ templates/base.html | 25 +-- 23 files changed, 1035 insertions(+), 23 deletions(-) create mode 100644 static/js/dss/templates/activityitemview.jst create mode 100644 static/js/dss/templates/activitylistview.jst create mode 100644 static/js/dss/templates/commentitemview.jst create mode 100644 static/js/dss/templates/commentlistview.jst create mode 100644 static/js/dss/templates/header.jst create mode 100644 static/js/dss/templates/mixdetailview.jst create mode 100644 static/js/dss/templates/mixeditview.jst create mode 100644 static/js/dss/templates/mixitemview.jst create mode 100644 static/js/dss/templates/mixlistlayout.jst create mode 100644 static/js/dss/templates/mixlistview.jst create mode 100644 static/js/dss/templates/mixtabheaderview.jst create mode 100644 static/js/dss/templates/notificationsitemview.jst create mode 100644 static/js/dss/templates/notificationslistview.jst create mode 100644 static/js/dss/templates/nowplaying.jst create mode 100644 static/js/dss/templates/search.jst create mode 100644 static/js/dss/templates/searchresultview.jst create mode 100644 static/js/dss/templates/sidebarview.jst create mode 100644 static/js/dss/templates/usereditview.jst create mode 100644 static/js/dss/templates/useritemview.jst create mode 100644 static/js/dss/templates/userlistview.jst create mode 100644 static/js/dss/templates/userprofileview.jst diff --git a/dss/pipelinesettings.py b/dss/pipelinesettings.py index 17600a2..5c92c26 100644 --- a/dss/pipelinesettings.py +++ b/dss/pipelinesettings.py @@ -4,6 +4,28 @@ PIPELINE_COMPILERS = ( 'pipeline.compilers.coffee.CoffeeScriptCompiler', ) +PIPELINE_CSS = { + 'css': { + 'source_filenames': ( + 'css/dss.overrides.css', + 'css/ace/uncompressed/bootstrap.css', + 'css/jasny-bootstrap.css', + 'css/ace/uncompressed/fullcalendar.css', + 'css/ace/uncompressed/dropzone.css', + 'css/ace/uncompressed/ace.css', + 'css/ace/uncompressed/ace-skins.css', + 'css/ace/uncompressed/font-awesome.css', + 'css/select2.css', + 'css/ace/uncompressed/bootstrap-editable.css', + 'css/jquery.fileupload-ui.css', + 'css/peneloplay.css', + 'css/toastr.css', + 'css/dss.main.css', + ), + 'output_filename': 'css/site.css' + } +} + PIPELINE_JS = { 'templates': { 'source_filenames': ( @@ -66,5 +88,5 @@ PIPELINE_JS = { 'js/dss/apps/**/**/*.coffee', ), 'output_filename': 'js/site.js', - } + }, } diff --git a/static/js/dss/templates/activityitemview.jst b/static/js/dss/templates/activityitemview.jst new file mode 100644 index 0000000..9330ca5 --- /dev/null +++ b/static/js/dss/templates/activityitemview.jst @@ -0,0 +1,25 @@ +
+
+ avatar image +
+ +
+
+ + <%= human_date %> +
+ +
+ <%= user_name %> +
+
+ <%= verb %> <%= item_name %> +
+ +
+ + + +
+
+
diff --git a/static/js/dss/templates/activitylistview.jst b/static/js/dss/templates/activitylistview.jst new file mode 100644 index 0000000..55d6a74 --- /dev/null +++ b/static/js/dss/templates/activitylistview.jst @@ -0,0 +1,11 @@ +
+

+ + Activity +

+
+
+
+ +
+
diff --git a/static/js/dss/templates/commentitemview.jst b/static/js/dss/templates/commentitemview.jst new file mode 100644 index 0000000..ce31417 --- /dev/null +++ b/static/js/dss/templates/commentitemview.jst @@ -0,0 +1,25 @@ +
+
+ <%= user_name %>'s Avatar +
+ +
+
+ + <%= humanise(date_created) %> +
+ +
+ <%= user_name %> +
+
<%= comment %>
+ + <% if (can_edit) { %> +
+ + + +
+ <% } %> +
+
\ No newline at end of file diff --git a/static/js/dss/templates/commentlistview.jst b/static/js/dss/templates/commentlistview.jst new file mode 100644 index 0000000..a1a9838 --- /dev/null +++ b/static/js/dss/templates/commentlistview.jst @@ -0,0 +1,14 @@ +
+
+

+ +

+
+ +
+
+
+
+
+
+ diff --git a/static/js/dss/templates/header.jst b/static/js/dss/templates/header.jst new file mode 100644 index 0000000..7edd224 --- /dev/null +++ b/static/js/dss/templates/header.jst @@ -0,0 +1,90 @@ +
+
+ + Deep|South|Sounds + +
+
+ +
+ +
diff --git a/static/js/dss/templates/mixdetailview.jst b/static/js/dss/templates/mixdetailview.jst new file mode 100644 index 0000000..00a2439 --- /dev/null +++ b/static/js/dss/templates/mixdetailview.jst @@ -0,0 +1,47 @@ +
+
+
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + + +
    +
    + 
    <%= description %>
    +
    +
    +
    +
    +
    +
    diff --git a/static/js/dss/templates/mixeditview.jst b/static/js/dss/templates/mixeditview.jst new file mode 100644 index 0000000..63aec6c --- /dev/null +++ b/static/js/dss/templates/mixeditview.jst @@ -0,0 +1,149 @@ +
    +
    +

    New Mix Wizard

    + +
    + +
    +
    +
    +
    +
    +
      +
    • + 1 + Mix +
      • +
    • + 2 + Details +
      • +
    • + 3 + Flair +
      • +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + + +
    + Your browser is too old for uploading file
    + Please come back with Chrome or Firefox +
    +
    +
    + +
    +
    + + + +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + +
    + +
    +
    +
    +
    +
    Mix Image (click to change)
    + +
    +
    + +
    +
    + + Select image + Change + + + Remove +
    +
    +
    + +
    +
    + + <% if (canHomepage()) { %> + + <% } %> +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    \ No newline at end of file diff --git a/static/js/dss/templates/mixitemview.jst b/static/js/dss/templates/mixitemview.jst new file mode 100644 index 0000000..8c137bd --- /dev/null +++ b/static/js/dss/templates/mixitemview.jst @@ -0,0 +1,157 @@ +
    +
    +
    + mix-logo +
    + + + +  <%= user_name %> + + + + + <%= humanise(upload_date) %> + + +
    +
    +
    +
    + <%= title %> + +
    +
    +
    + <% _.each(genres, function(i) { %> + <%= + i.description %> + <% }); %> +
    +
    +
    +
    + +
    +
    + mix waveform + +
    +
    <%= secondsToHms(duration) %> +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    + + +
    +
    + <% if (utils.isAuth()) { %> + +
    + Favourite<% if (favourited) {%>d<% } %> + +
    + <% } %> +
    +
      +
    • + + <%= play_count %> + +
      • +
    • + + <%= download_count %> + +
      • +
    • + + <%= comment_count %> + +
      • +
    • + + <%= like_count %> + +
      • +
    +
    + <% if(can_edit) { %> +
    + Edit +
    +
    + Delete +
    + <% } %> + <% if (download_allowed) { %> + <% if (utils.isAuth()) { %> +
    + + Download +
    + <% }else { %> + + <% } %> + <% } %> +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/static/js/dss/templates/mixlistlayout.jst b/static/js/dss/templates/mixlistlayout.jst new file mode 100644 index 0000000..c1c581c --- /dev/null +++ b/static/js/dss/templates/mixlistlayout.jst @@ -0,0 +1,5 @@ +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/static/js/dss/templates/mixlistview.jst b/static/js/dss/templates/mixlistview.jst new file mode 100644 index 0000000..b89b6d5 --- /dev/null +++ b/static/js/dss/templates/mixlistview.jst @@ -0,0 +1,5 @@ +
    +
      + +
    +
    \ No newline at end of file diff --git a/static/js/dss/templates/mixtabheaderview.jst b/static/js/dss/templates/mixtabheaderview.jst new file mode 100644 index 0000000..716703c --- /dev/null +++ b/static/js/dss/templates/mixtabheaderview.jst @@ -0,0 +1,10 @@ + diff --git a/static/js/dss/templates/notificationsitemview.jst b/static/js/dss/templates/notificationsitemview.jst new file mode 100644 index 0000000..39065fe --- /dev/null +++ b/static/js/dss/templates/notificationsitemview.jst @@ -0,0 +1,13 @@ + + Avatar Image + + + <%= user_name %> + <%= verb %> <%= target %> + + + + <%= humanise(date) %> + + + diff --git a/static/js/dss/templates/notificationslistview.jst b/static/js/dss/templates/notificationslistview.jst new file mode 100644 index 0000000..48a2d59 --- /dev/null +++ b/static/js/dss/templates/notificationslistview.jst @@ -0,0 +1,11 @@ + + + + + + diff --git a/static/js/dss/templates/nowplaying.jst b/static/js/dss/templates/nowplaying.jst new file mode 100644 index 0000000..862dffd --- /dev/null +++ b/static/js/dss/templates/nowplaying.jst @@ -0,0 +1,30 @@ +
    +
    + + Now Playing +
    +
    + +
    +
    + +
    + + + + + + +
    +
    +
    diff --git a/static/js/dss/templates/search.jst b/static/js/dss/templates/search.jst new file mode 100644 index 0000000..64bbd11 --- /dev/null +++ b/static/js/dss/templates/search.jst @@ -0,0 +1,15 @@ + diff --git a/static/js/dss/templates/searchresultview.jst b/static/js/dss/templates/searchresultview.jst new file mode 100644 index 0000000..bdb5139 --- /dev/null +++ b/static/js/dss/templates/searchresultview.jst @@ -0,0 +1,16 @@ +
  • + + <%= title %> + + + <%= user_name %>: + <%= title %> + + + + + <%= moment(upload_date).fromNow() %> + + + +
    • \ No newline at end of file diff --git a/static/js/dss/templates/sidebarview.jst b/static/js/dss/templates/sidebarview.jst new file mode 100644 index 0000000..ca852e2 --- /dev/null +++ b/static/js/dss/templates/sidebarview.jst @@ -0,0 +1,4 @@ + + +
    \ No newline at end of file diff --git a/static/js/dss/templates/usereditview.jst b/static/js/dss/templates/usereditview.jst new file mode 100644 index 0000000..af64b09 --- /dev/null +++ b/static/js/dss/templates/usereditview.jst @@ -0,0 +1,125 @@ +
    +

    User details

    +
    +
    +
    +
    + +
    +
    +
    + + +
    + +
    +
    +
    + + +
    + +
    +
    +
    + + +
    + +
    +
    +
    + + +
    + + + +
    +
    +

    + + Choose your custom image in your Profile Page +

    +
    +
    +
    +

    +

    What can we share about you?
    +

    +
    +
    Share this activity
    + + + + + + + + + + + + + +
    LikesFavouritesComments
    + > + + > + + > +
    +
    +
    +
    On these networks
    + + + + + + + + + + + +
    FacebookTwitter
    + > + + > +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    diff --git a/static/js/dss/templates/useritemview.jst b/static/js/dss/templates/useritemview.jst new file mode 100644 index 0000000..8cbeb0b --- /dev/null +++ b/static/js/dss/templates/useritemview.jst @@ -0,0 +1,110 @@ +
    +

    + + <%= display_name %> + + + + Mixes + <%= mix_count%> + + + + Favourites + <%= favourite_count %> + + + + Likes + <%= like_count %> + + + + Followers + <%= followers.length %> + + + + Following + <%= following.length %> + + +

    + +
    + + Avatar Image + + +
    +
    +
    + <% if (isMe(id)) { %> + + +   + <%= display_name %> + + + <% } else { %> +

    + +   + <%= display_name %> +

    + <% } %> +
    +
    +
    +
    +
    + <%= description %> +
    +
    +
    +
    +
    +
    +
    +  Joined: <%= humanise(date_joined) %> +  Last Seen: <%= humanise(last_login) %> +
    + <% if (utils.isAuth()) {%> + + <% } else { %> + + <% } %> +
    +
    +
    +
    +
    diff --git a/static/js/dss/templates/userlistview.jst b/static/js/dss/templates/userlistview.jst new file mode 100644 index 0000000..070216f --- /dev/null +++ b/static/js/dss/templates/userlistview.jst @@ -0,0 +1,12 @@ +
    +
    + + + + +
    +
    +
    + +
    \ No newline at end of file diff --git a/static/js/dss/templates/userprofileview.jst b/static/js/dss/templates/userprofileview.jst new file mode 100644 index 0000000..3c29bc8 --- /dev/null +++ b/static/js/dss/templates/userprofileview.jst @@ -0,0 +1,135 @@ +
    +
    +
    + +
    +
    diff --git a/templates/base.html b/templates/base.html index 27152f6..b1b7fde 100755 --- a/templates/base.html +++ b/templates/base.html @@ -1,32 +1,14 @@ +{% load static %} +{% load compressed %} Deep South Sounds {% include 'inc/meta.html' %} - {% load static %} - {% load compressed %} - - - - - - - - - - - - - - - - - - - + {% compressed_css 'css' %} {% block headerstyles %} {% endblock %} @@ -65,7 +47,6 @@ - {% compressed_js 'lib' %} {% compressed_js 'backbone' %} {% compressed_js 'site' %}