diff options
Diffstat (limited to 'shardweb/lib')
| -rw-r--r-- | shardweb/lib/router.ex | 4 | ||||
| -rw-r--r-- | shardweb/lib/templates/chat/chat.html.eex | 2 | ||||
| -rw-r--r-- | shardweb/lib/templates/layout/app.html.eex | 7 | ||||
| -rw-r--r-- | shardweb/lib/templates/page/shard_list.html.eex | 8 |
4 files changed, 9 insertions, 12 deletions
diff --git a/shardweb/lib/router.ex b/shardweb/lib/router.ex index 2c69b8c..981f946 100644 --- a/shardweb/lib/router.ex +++ b/shardweb/lib/router.ex @@ -18,9 +18,9 @@ defmodule ShardWeb.Router do scope "/", ShardWeb do pipe_through :browser # Use the default browser stack - get "/", PageController, :peer_list + get "/", PageController, :shard_list + get "/peers", PageController, :peer_list post "/peer/add", PageController, :add_peer - get "/dashboard", PageController, :shard_list get "/people", IdentityController, :list get "/people/:pk", IdentityController, :view diff --git a/shardweb/lib/templates/chat/chat.html.eex b/shardweb/lib/templates/chat/chat.html.eex index 45609d8..28cc9e6 100644 --- a/shardweb/lib/templates/chat/chat.html.eex +++ b/shardweb/lib/templates/chat/chat.html.eex @@ -18,7 +18,7 @@ <i class="fa fa-comments"></i> Chat rooms </li> <li class="active"> - <i class="fa fa-users"></i> #<%= @chan %> + <i class="fa fa-hashtag"></i> <%= @chan %> </li> <% else %> <li> diff --git a/shardweb/lib/templates/layout/app.html.eex b/shardweb/lib/templates/layout/app.html.eex index 067ad57..44ba35d 100644 --- a/shardweb/lib/templates/layout/app.html.eex +++ b/shardweb/lib/templates/layout/app.html.eex @@ -21,7 +21,7 @@ <link href="<%= static_path(@conn, "/css/plugins/morris.css") %>" rel="stylesheet"> <!-- Custom Fonts --> - <link href="<%= static_path(@conn, "/font-awesome/css/font-awesome.min.css") %>" rel="stylesheet" type="text/css"> + <link href="<%= static_path(@conn, "/css/font-awesome.min.css") %>" rel="stylesheet" type="text/css"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> @@ -47,7 +47,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="<%= page_path(@conn, :peer_list) %>">Shard</a> + <a class="navbar-brand" href="<%= page_path(@conn, :shard_list) %>">Shard</a> </div> <!-- Top Menu Items --> <ul class="nav navbar-right top-nav"> @@ -176,9 +176,6 @@ <li> <a href="#"><i class="fa fa-fw fa-gear"></i> Settings</a> </li> - <li class="<%= if @view_module == ShardWeb.PageView and @view_template == "shard_list.html" do "active" else "" end %>"> - <a href="<%= page_path(@conn, :shard_list) %>"><i class="fa fa-fw fa-dashboard"></i> Dashboard</a> - </li> </ul> </div> <!-- /.navbar-collapse --> diff --git a/shardweb/lib/templates/page/shard_list.html.eex b/shardweb/lib/templates/page/shard_list.html.eex index 485bfa1..012223a 100644 --- a/shardweb/lib/templates/page/shard_list.html.eex +++ b/shardweb/lib/templates/page/shard_list.html.eex @@ -35,15 +35,15 @@ <small><%= Shard.Keys.pk_display pk %></small> </a> - <% %SApp.Chat.Manifest{channel: chan} -> %><i class="fa fa-comments"></i> + <% %SApp.Chat.Manifest{channel: chan} -> %><i class="fa fa-hashtag"></i> <a href="<%= chat_path(@conn, :chat, chan) %>"> - #<%= chan %> + <%= chan %> </a> - <% %SApp.Chat.PrivChat.Manifest{pk_list: pk_list} -> %><i class="fa fa-comment"></i> + <% %SApp.Chat.PrivChat.Manifest{pk_list: pk_list} -> %><i class="fa fa-comments"></i> <a href="<%= chat_path(@conn, :privchat, (pk_list |> Enum.filter(&(&1!=@pk)) |> Enum.map(&Base.encode16/1) |> Enum.join(","))) %>"> - @<%= pk_list |> Enum.filter(&(&1!=@pk)) |> Enum.map(&SApp.Identity.get_nick/1) |> Enum.join(", ") %> + <%= pk_list |> Enum.filter(&(&1!=@pk)) |> Enum.map(&SApp.Identity.get_nick/1) |> Enum.join(", ") %> </a> <% x -> %> <%= inspect x %> |