paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 21:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compose box UI experiment.

Browse Source 
(imported from commit cf95f39da1a8c6558d2a3c3629efe425e274e80d)
This commit is contained in:
Waseem Daher
2012-09-27 16:54:27 -04:00
parent 8b87ba04ef
commit 1c63c2b19c
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
templates/zephyr/home.html
View File

@@ -25,14 +25,15 @@
</div>
<div class="tabbable zephyr_compose" id="zephyr_compose">
<ul class="nav nav-tabs" id="zephyr-type-tabs">
<li class="active"><a href="#class-message" data-toggle="tab">Stream</a></li>
<li><a href="#personal-message" data-toggle="tab">Huddle</a></li>
<li class="alert" id="send-status"></li>
<li class="pull-right"><button type="button" class="close" onclick="hide_compose()">×</button></li>
</ul>
<div class="tab-content">
<div class="alert" id="send-status"></div>
<div class="pull-right"><button type="button" class="close" onclick="hide_compose()">×</button></div>
<div id="stream_or_huddle">
<ul class="nav nav-pills nav-stacked" id="zephyr-type-tabs">
<li class="active"><a href="#class-message" data-toggle="pill">Stream</a></li>
<li><a href="#personal-message" data-toggle="pill">Huddle</a></li>
</ul>
</div>
<div class="tab-pane active" id="class-message">
<div class="zephyr_comp">
<form action="/zephyr/" method="post" class="zephyr">

6
templates/zephyr/index.html
View File

@@ -93,17 +93,17 @@ var have_initial_messages = {{ have_initial_messages }};
<div class="row-fluid" id="connection-error">
<div class="span12">
<div class="alert alert-error">
<div class="alert alert_sidebar alert-error">
<strong>Can't receive messages</strong> &mdash; try reloading the page.
</div>
</div>
</div>
<div class="alert" id="class-dne">
<div class="alert alert_sidebar" id="class-dne">
<p>The class <span class="classname" id="class-dne-name"></span> does not exist.</p>
<a id="create-it" class="btn btn-primary" href="#">Create and send</a>
<a class="btn" onClick="$('#class-dne').stop(true).fadeOut(500);">Cancel message</a>
</div>
<div class="alert" id="class-nosub">
<div class="alert alert_sidebar" id="class-nosub">
<p>You're not subscribed to the class <span class="classname" id="class-nosub-name"></span>.</p>
<a id="sub-it" class="btn btn-primary" href="#">Subscribe and send</a>
<a class="btn" onClick="$('#class-nosub').stop(true).fadeOut(500);">Cancel message</a>

20
zephyr/static/styles/zephyr.css
View File

@@ -192,7 +192,7 @@ img.profile_picture {
height: 30px;
}
.alert {
.alert_sidebar {
max-width: 20%;
}
@@ -304,11 +304,6 @@ input.send_zephyr {
width: 2px;
}
#zephyr-type-tabs {
margin-top: 10px;
margin-bottom: 0px;
}
#subscriptions {
top: 0;
bottom: 0;
@@ -347,3 +342,16 @@ input.send_zephyr {
width: 40px;
padding-right: 40px;
}
#stream_or_huddle {
position: absolute;
bottom: 21px;
left: 5px;
padding: 0.35em;
border: 1px solid grey;
}
#zephyr-type-tabs {
margin-top: 0px;
margin-bottom: 0px;
}