Permalink
Browse files

Cleanup spaces

  • Loading branch information...
rosylilly committed Oct 22, 2017
1 parent 704dbd5 commit 3db65770d75e759fd331210e99e09e562dd3d38e
@@ -1,15 +1 @@
<form action="/add_channel" method="post">
<div class="form-group row">
<label for="inputname" class="col-sm-2 col-form-label">チャンネル名</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="name" id="inputname">
</div>
</div>
<div class="form-group row">
<label for="inputdescription" class="col-sm-2 col-form-label">詳細</label>
<div class="col-sm-10">
<textarea class="form-control input-sm" rows="3" name="description" id="inputdescription"></textarea>
</div>
</div>
<button type="submit" class="btn btn-primary">登録</button>
</form>
<form action="/add_channel" method="post"><div class="form-group row"><label for="inputname" class="col-sm-2 col-form-label">チャンネル名</label><div class="col-sm-10"><input type="text" class="form-control" name="name" id="inputname"></div></div><div class="form-group row"><label for="inputdescription" class="col-sm-2 col-form-label">詳細</label><div class="col-sm-10"><textarea class="form-control input-sm" rows="3" name="description" id="inputdescription"></textarea></div></div><button type="submit" class="btn btn-primary">登録</button></form>
@@ -1,15 +1 @@
<div class="well"><%= @description %></div>
<div id="timeline"></div>
<% if user %>
<div class="row">
<div class="col-sm-9 col-md-9" id="chatbox-frame">
<div class="input-group chatbox">
<textarea class="form-control" rows="3" id="chatbox-textarea"></textarea>
<span class="input-group-btn"> <button class="btn btn-primary" onclick="on_send_button()">送信</button> </span>
</div>
</div>
</div>
<% end %>
<script type="text/javascript" src="/js/chat.js"></script>
<div class="well"><%= @description %></div><div id="timeline"></div><% if user %><div class="row"><div class="col-sm-9 col-md-9" id="chatbox-frame"><div class="input-group chatbox"><textarea class="form-control" rows="3" id="chatbox-textarea"></textarea><span class="input-group-btn"><button class="btn btn-primary" onclick="on_send_button()">送信</button></span></div></div></div><% end %><script type="text/javascript" src="/js/chat.js"></script>
@@ -1,27 +1 @@
<div id="history">
<% @messages.each do |msg| %>
<div class="media message">
<img class="avatar d-flex align-self-start mr-3" src="/icons/<%= msg['user']['avatar_icon'] %>" alt="no avatar">
<div class="media-body">
<h5 class="mt-0"><a href="/profile/<%= msg['user']['name'] %>"><%= msg['user']['display_name'] %>@<%= msg['user']['name'] %></a></h5>
<p class="content"><%= msg['content'] %></p>
<p class="message-date"><%= msg['date'] %></p>
</div>
</div>
<% end %>
</div>
<nav>
<ul class="pagination">
<% if 1 < @page %>
<li><a href="/history/<%= @channel_id %>?page=<%= @page - 1 %>"><span>«</span></a></li>
<% end %>
<% 1.upto(@max_page) do |p| %>
<% if @page == p %> <li class="active"> <% else %> <li> <% end %>
<a href="/history/<%= @channel_id %>?page=<%= p %>"><%= p %></a></li>
<% end %>
<% if @page < @max_page %>
<li><a href="/history/<%= @channel_id %>?page=<%= @page + 1 %>"><span>»</span></a></li>
<% end %>
</ul>
</nav>
<div id="history"><% @messages.each do |msg| %><div class="media message"><img class="avatar d-flex align-self-start mr-3" src="/icons/<%= msg['user']['avatar_icon'] %>" alt="no avatar"><div class="media-body"><h5 class="mt-0"><a href="/profile/<%= msg['user']['name'] %>"><%= msg['user']['display_name'] %>@<%= msg['user']['name'] %></a></h5><p class="content"><%= msg['content'] %></p><p class="message-date"><%= msg['date'] %></p></div></div><% end %></div><nav><ul class="pagination"><% if 1 < @page %><li><a href="/history/<%= @channel_id %>?page=<%= @page - 1 %>"><span>«</span></a></li><% end %><% 1.upto(@max_page) do |p| %><% if @page == p %> <li class="active"> <% else %> <li> <% end %><a href="/history/<%= @channel_id %>?page=<%= p %>"><%= p %></a></li><% end %><% if @page < @max_page %><li><a href="/history/<%= @channel_id %>?page=<%= @page + 1 %>"><span>»</span></a></li><% end %></ul></nav>
@@ -1,4 +1 @@
<h1>ようこそ Isubata へ。</h1>
<p>Isubata は世界最速のチャットアプリケーションです。</p>
<p>利用を開始するには<a href="/login">ログイン</a>してください。</p>
<p>アカウントをお持ちでない場合は<a href="/register">新規登録</a>してください。</p>
<h1>ようこそ Isubata へ。</h1><p>Isubata は世界最速のチャットアプリケーションです。</p><p>利用を開始するには<a href="/login">ログイン</a>してください。</p><p>アカウントをお持ちでない場合は<a href="/register">新規登録</a>してください。</p>
@@ -1,60 +1 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html" charset="utf-8">
<title>Isubata</title>
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/main.css">
<script type="text/javascript" src="/js/jquery.min.js"></script>
<script type="text/javascript" src="/js/tether.min.js"></script>
<script type="text/javascript" src="/js/bootstrap.min.js"></script>
</head>
<body>
<nav class="navbar navbar-toggleable-md navbar-inverse fixed-top bg-inverse">
<button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="/">Isubata</a>
<div class="collapse navbar-collapse" id="navbarsExampleDefault">
<ul class="nav navbar-nav ml-auto">
<% if @channel_id %>
<li class="nav-item"><a href="/history/<%= @channel_id %>" class="nav-link">チャットログ</a></li>
<% end %>
<% if user %>
<li class="nav-item"><a href="/add_channel" class="nav-link">チャンネル追加</a></li>
<li class="nav-item"><a href="/profile/<%= user['name'] %>" class="nav-link"><%= user['display_name'] %></a></li>
<li class="nav-item"><a href="/logout" class="nav-link">ログアウト</a></li>
<% else %>
<li><a href="/register" class="nav-link">新規登録</a></li>
<li><a href="/login" class="nav-link">ログイン</a></li>
<% end %>
</ul>
</div>
</nav>
<div class="container-fluid">
<div class="row">
<nav class="col-sm-3 col-md-3 hidden-xs-down bg-faded sidebar">
<% if user %>
<ul class="nav nav-pills flex-column">
<% @channels.each do |channel| %>
<li class="nav-item">
<a class="nav-link justify-content-between <% if @channel_id == channel['id'] %> active <% end %>" href="/channel/<%= channel['id'] %>">
<%= channel['name'] %>
<span class="badge badge-pill badge-primary float-right" id="unread-<%= channel['id'] %>"></span>
</a>
</li>
<% end %>
</ul>
<% end %>
</nav>
<main class="col-sm-9 offset-sm-3 col-md-9 offset-md-3 pt-3">
<%= yield %>
</main>
</div>
</div>
</body>
</html>
<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html" charset="utf-8"><title>Isubata</title><link rel="stylesheet" href="/css/bootstrap.min.css"><link rel="stylesheet" href="/css/main.css"><script type="text/javascript" src="/js/jquery.min.js"></script><script type="text/javascript" src="/js/tether.min.js"></script><script type="text/javascript" src="/js/bootstrap.min.js"></script></head><body><nav class="navbar navbar-toggleable-md navbar-inverse fixed-top bg-inverse"><button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button><a class="navbar-brand" href="/">Isubata</a><div class="collapse navbar-collapse" id="navbarsExampleDefault"><ul class="nav navbar-nav ml-auto"><% if @channel_id %><li class="nav-item"><a href="/history/<%= @channel_id %>" class="nav-link">チャットログ</a></li><% end %><% if user %><li class="nav-item"><a href="/add_channel" class="nav-link">チャンネル追加</a></li><li class="nav-item"><a href="/profile/<%= user['name'] %>" class="nav-link"><%= user['display_name'] %></a></li><li class="nav-item"><a href="/logout" class="nav-link">ログアウト</a></li><% else %><li><a href="/register" class="nav-link">新規登録</a></li><li><a href="/login" class="nav-link">ログイン</a></li><% end %></ul></div></nav><div class="container-fluid"><div class="row"><nav class="col-sm-3 col-md-3 hidden-xs-down bg-faded sidebar"><% if user %><ul class="nav nav-pills flex-column"><% @channels.each do |channel| %><li class="nav-item"><a class="nav-link justify-content-between <% if @channel_id == channel['id'] %> active <% end %>" href="/channel/<%= channel['id'] %>"><%= channel['name'] %><span class="badge badge-pill badge-primary float-right" id="unread-<%= channel['id'] %>"></span></a></li><% end %></ul><% end %></nav><main class="col-sm-9 offset-sm-3 col-md-9 offset-md-3 pt-3"><%= yield %></main></div></div></body></html>
@@ -1,15 +1 @@
<form action="/login" method="post">
<div class="form-group row">
<label for="inputname" class="col-sm-2 col-form-label">ユーザ名</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="name" id="inputname" placeholder="User">
</div>
</div>
<div class="form-group row">
<label for="inputpass" class="col-sm-2 col-form-label">パスワード</label>
<div class="col-sm-10">
<input type="password" class="form-control" name="password" id="inputpass" placeholder="Password">
</div>
</div>
<button type="submit" class="btn btn-primary">ログイン</button>
</form>
<form action="/login" method="post"><div class="form-group row"><label for="inputname" class="col-sm-2 col-form-label">ユーザ名</label><div class="col-sm-10"><input type="text" class="form-control" name="name" id="inputname" placeholder="User"></div></div><div class="form-group row"><label for="inputpass" class="col-sm-2 col-form-label">パスワード</label><div class="col-sm-10"><input type="password" class="form-control" name="password" id="inputpass" placeholder="Password"></div></div><button type="submit" class="btn btn-primary">ログイン</button></form>
@@ -1,34 +1 @@
<% if @self_profile %>
<form action="/profile" method="post" enctype="multipart/form-data">
<div class="form-group row">
<label class="col-sm-2 col-form-label">ユーザ名</label>
<div class="col-sm-10"> <p><%= user['name'] %></p> </div>
<label class="col-sm-2 col-form-label">表示名</label>
<div class="col-sm-10"> <input type="text" class="form-control" name="display_name" placeholder="表示名" value= "<%= user['display_name'] %>"> </div>
<label class="col-sm-2 col-form-label">アイコン</label>
<div class="col-sm-10"> <input type="file" name="avatar_icon"></input> </div>
<div class="col-sm-2"></div>
<div class="col-sm-10"> <img class="avatar-lg" src="/icons/<%= user['avatar_icon'] %>" alt="no avatar"> </div>
</div>
<button type="submit" class="btn btn-primary">更新</button>
</form>
<% else %>
<div class="form-group row">
<label class="col-sm-2 col-form-label">ユーザ名</label>
<div class="col-sm-10"> <p><%= @user['name'] %></p> </div>
<label class="col-sm-2 col-form-label">表示名</label>
<div class="col-sm-10"> <p><%= @user['display_name'] %></p> </div>
<label class="col-sm-2 col-form-label">アイコン</label>
<div class="col-sm-10"> <img class="avatar-lg" src="/icons/<%= @user['avatar_icon'] %>" alt="no avatar"> </div>
</div>
<% end %>
<% if @self_profile %><form action="/profile" method="post" enctype="multipart/form-data"><div class="form-group row"><label class="col-sm-2 col-form-label">ユーザ名</label><div class="col-sm-10"><p><%= user['name'] %></p></div><label class="col-sm-2 col-form-label">表示名</label><div class="col-sm-10"><input type="text" class="form-control" name="display_name" placeholder="表示名" value= "<%= user['display_name'] %>"></div><label class="col-sm-2 col-form-label">アイコン</label><div class="col-sm-10"><input type="file" name="avatar_icon"></input></div><div class="col-sm-2"></div><div class="col-sm-10"><img class="avatar-lg" src="/icons/<%= user['avatar_icon'] %>" alt="no avatar"></div></div><button type="submit" class="btn btn-primary">更新</button></form><% else %><div class="form-group row"><label class="col-sm-2 col-form-label">ユーザ名</label><div class="col-sm-10"><p><%= @user['name'] %></p></div><label class="col-sm-2 col-form-label">表示名</label><div class="col-sm-10"><p><%= @user['display_name'] %></p></div><label class="col-sm-2 col-form-label">アイコン</label><div class="col-sm-10"><img class="avatar-lg" src="/icons/<%= @user['avatar_icon'] %>" alt="no avatar"></div></div><% end %>
@@ -1,15 +1 @@
<form action="/register" method="post">
<div class="form-group row">
<label for="inputname" class="col-sm-2 col-form-label">ユーザ名</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="name" id="inputname" placeholder="User">
</div>
</div>
<div class="form-group row">
<label for="inputpass" class="col-sm-2 col-form-label">パスワード</label>
<div class="col-sm-10">
<input type="password" class="form-control" name="password" id="inputpass" placeholder="Password">
</div>
</div>
<button type="submit" class="btn btn-primary">登録</button>
</form>
<form action="/register" method="post"><div class="form-group row"><label for="inputname" class="col-sm-2 col-form-label">ユーザ名</label><div class="col-sm-10"><input type="text" class="form-control" name="name" id="inputname" placeholder="User"></div></div><div class="form-group row"><label for="inputpass" class="col-sm-2 col-form-label">パスワード</label><div class="col-sm-10"><input type="password" class="form-control" name="password" id="inputpass" placeholder="Password"></div></div><button type="submit" class="btn btn-primary">登録</button></form>

0 comments on commit 3db6577

Please sign in to comment.