diff --git a/app/assets/javascripts/sources.js b/app/assets/javascripts/sources.js index 027e0566b..199b40a6f 100644 --- a/app/assets/javascripts/sources.js +++ b/app/assets/javascripts/sources.js @@ -2,7 +2,13 @@ Danbooru.Sources = {}; Danbooru.Sources.get = function(url) { - + $.get("/sources.json", { + url: url + }).success(function(data) { + console.log(data); + }).error(function(data) { + console.log(data); + }); } })(); diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 35dcaf2d4..d09269cf9 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -90,6 +90,11 @@ a.active { font-weight: bold; } +a.login { + font-weight: bold; + color: #e00; +} + abbr[title=required] { display: none; } diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb new file mode 100644 index 000000000..a30ae4119 --- /dev/null +++ b/app/views/layouts/_main_links.html.erb @@ -0,0 +1,23 @@ + + <% if CurrentUser.user.is_anonymous? %> + <%= nav_link_to("Login", new_session_path, :class => "login") %> + <% else %> + <%= nav_link_to("My Account", user_path(CurrentUser.user)) %> + <% end %> + <%= nav_link_to("Posts", posts_path) %> + <%= nav_link_to("Comments", comments_path(:group_by => "post")) %> + <%= nav_link_to("Notes", notes_path(:group_by => "post")) %> + <%= nav_link_to("Artists", artists_path(:order => "date")) %> + <%= nav_link_to("Tags", tags_path(:order => "date")) %> + <% if CurrentUser.is_moderator? %> + <%= nav_link_to("Aliases", tag_aliases_path) %> + <%= nav_link_to("Implications", tag_implications_path) %> + <% end %> + <%= nav_link_to("Pools", pools_path) %> + <%= nav_link_to("Wiki", wiki_pages_path(:title => "help:home")) %> + <%= nav_link_to("Forum", forum_topics_path, :class => (CurrentUser.user.has_forum_been_updated? ? "forum-updated" : nil)) %> + <% if CurrentUser.is_janitor? %> + <%= nav_link_to("Dashboard", moderator_dashboard_path) %> + <% end %> + <%= nav_link_to("»".html_safe, site_map_path) %> + \ No newline at end of file diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 10e204a08..f49979abb 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -27,29 +27,7 @@

<%= link_to Danbooru.config.app_name, "/" %>