diff options
| author | Scott Ostler <scottbot9000@gmail.com> | 2010-11-02 19:55:35 -0400 |
|---|---|---|
| committer | Scott Ostler <scottbot9000@gmail.com> | 2010-11-02 19:55:35 -0400 |
| commit | e2e82dc608862c0c72e0d45599f2768665edf7dd (patch) | |
| tree | baad5d86f85c230afd6c61c40e6d3d7e4cd3f1c9 /template/rooms | |
| parent | 73443969b5e98713e1bd36b0b524f60b77a0ad53 (diff) | |
| parent | 1f1378031e0f643011e22942ed6005d4000d015d (diff) | |
Merge src/site.clj conflict
Diffstat (limited to 'template/rooms')
| -rw-r--r-- | template/rooms/chat.st | 2 | ||||
| -rw-r--r-- | template/rooms/mgmt.st | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/template/rooms/chat.st b/template/rooms/chat.st index 7a8df88..b96456a 100644 --- a/template/rooms/chat.st +++ b/template/rooms/chat.st @@ -77,7 +77,7 @@ <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love. <br><br> <span id="signintxt"> - you already have an account, <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong>. If not, <strong><a href="http://dump.fm/register">register</a></strong>! + If you already have an account <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://dump.fm/register">register</a></strong>! </span> </center> </div> diff --git a/template/rooms/mgmt.st b/template/rooms/mgmt.st index 480fe46..dc7060b 100644 --- a/template/rooms/mgmt.st +++ b/template/rooms/mgmt.st @@ -25,13 +25,6 @@ <link rel="stylesheet" type="text/css" href="$domain$/static/css/mgmt.css"> <script>Domain = "$domain$"</script> -$if(!user_nick)$ -<link href="$domain$/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css"> -<script type="text/javascript" src="$domain$/static/js/popup.js"></script> - - -$endif$ - $if(isadmin)$ <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" /> |