From 64005f7777923411ffaafeeadb58469e0f853ecb Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 5 Sep 2013 23:09:09 +0200
Subject: Fix modal not showing up

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/file/html_header.php | 140 +++++++++++++++++----------------
 1 file changed, 72 insertions(+), 68 deletions(-)

(limited to 'application/views')

diff --git a/application/views/file/html_header.php b/application/views/file/html_header.php
index 2e89bd4fc..127668397 100644
--- a/application/views/file/html_header.php
+++ b/application/views/file/html_header.php
@@ -19,76 +19,80 @@ include(FCPATH."application/views/header.php"); ?>
 
 	<div class="container paste-container">
 		<div style="border:1px solid #ccc;">
-		<div class="navbar navbar-default navbar-static-top navbar-paste">
-			<div class="navbar-inner" style="box-shadow: none;">
-				<ul class="nav navbar-nav">
-					<li><a href="#file-info" class="navbar-brand" data-toggle="modal"><?php echo $title ?></a></li>
-					<li class="divider"></li>
-					<li class="dropdown">
-						<a href="#" class="dropdown-toggle" data-toggle="dropdown" id="language-toggle">
-							Language: <?php echo htmlspecialchars($current_highlight); ?>
-							<b class="caret"></b>
-						</a>
-						<div class="dropdown-menu" style="padding: 15px;">
-							<form>
-								<input type="text" id="language" placeholder="Language" class="form-control">
-							</form>
-						</div>
-					</li>
-					<li class="divider"></li>
-					<li>
-						<a href="#file-info" role="button" data-toggle="modal">Info</a>
-						<div id="file-info" class="modal hide fade">
-							<div class="modal-header">
-								<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-								<h3>Paste Information</h3>
-							</div>
-							<div class="modal-body">
-								<table class="table">
-									<tr>
-										<td style="border:0;">Filename:</td>
-										<td style="border:0;"><?php echo htmlspecialchars($filedata["filename"]) ?></td>
-									</tr>
-									<tr>
-										<td>Size:</td>
-										<td><?php echo format_bytes($filedata["filesize"]) ?></td>
-									</tr>
-									<tr>
-										<td>Mimetype:</td>
-										<td><?php echo $filedata["mimetype"] ?></td>
-									</tr>
-									<tr>
-										<td>Uploaded:</td>
-										<td><?php echo date("r", $filedata["date"]) ?></td>
-									</tr>
-									<tr>
-										<td>Removal:</td>
-										<td><?php echo $timeout ?></td>
-									</tr>
-								</table>
-							</div>
-							<div class="modal-footer">
-								<?php echo form_open("file/do_delete/", array("style" => "display: inline")); ?>
-									<input type="hidden" name="ids[<?php echo $id; ?>]" value="<?php echo $id; ?>">
-									<button class="btn btn-danger pull-left" aria-hidden="true">Delete</button>
+			<div class="navbar navbar-default navbar-static-top navbar-paste">
+				<div class="navbar-inner" style="box-shadow: none;">
+					<ul class="nav navbar-nav">
+						<li><a href="#file-info" class="navbar-brand" data-toggle="modal"><?php echo $title ?></a></li>
+						<li class="divider"></li>
+						<li class="dropdown">
+							<a href="#" class="dropdown-toggle" data-toggle="dropdown" id="language-toggle">
+								Language: <?php echo htmlspecialchars($current_highlight); ?>
+								<b class="caret"></b>
+							</a>
+							<div class="dropdown-menu" style="padding: 15px;">
+								<form>
+									<input type="text" id="language" placeholder="Language" class="form-control">
 								</form>
-								<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
 							</div>
+						</li>
+						<li class="divider"></li>
+						<li>
+							<a href="#file-info" role="button" data-toggle="modal">Info</a>
+						</li>
+						<li class="divider"></li>
+						<li><a href="<?php echo site_url('file/index?repaste='.$id); ?>" role="button">Repaste</a></li>
+					</ul>
+					<div class="btn-group pull-right" style="margin: 8px;">
+						<a id="linewrap" class="btn btn-default" rel="tooltip" title="Toggle wrapping of long lines">Linewrap</a>
+						<a href="<?php echo site_url($id."/plain") ?>" class="btn btn-default" rel="tooltip" title="View as plain text">Plain</a>
+						<a href="<?php echo site_url($id) ?>" class="btn btn-default" rel="tooltip" title="View as raw file (org. mime type)">Raw</a>
+						<?php if ($current_highlight === 'rmd') { ?>
+							<a href="<?php echo site_url($id)."/" ?>" class="btn btn-default" rel="tooltip" title="Render as Code">Code</a>
+						<?php } else { ?>
+							<a href="<?php echo site_url($id."/rmd") ?>" class="btn btn-default" rel="tooltip" title="Render as Markdown">Markdown</a>
+						<?php } ?>
+					</div>
+				</div>
+			</div> <!-- .navbar -->
+			<div id="file-info" class="modal fade" role="dialog" aria-labelledby="file-info" aria-hidden="true">
+				<div class="modal-dialog">
+					<div class="modal-content">
+						<div class="modal-header">
+							<button type="button" class="close" data-dismiss="modal">&times;</button>
+							<h3 class="modal-title">Paste Information</h3>
 						</div>
-					</li>
-					<li class="divider"></li>
-					<li><a href="<?php echo site_url('file/index?repaste='.$id); ?>" role="button">Repaste</a></li>
-				</ul>
-				<div class="btn-group pull-right" style="margin-top: 7px; margin-right: 10px;">
-					<a id="linewrap" class="btn btn-default" rel="tooltip" title="Toggle wrapping of long lines">Linewrap</a>
-					<a href="<?php echo site_url($id."/plain") ?>" class="btn btn-default" rel="tooltip" title="View as plain text">Plain</a>
-					<a href="<?php echo site_url($id) ?>" class="btn btn-default" rel="tooltip" title="View as raw file (org. mime type)">Raw</a>
-					<?php if ($current_highlight === 'rmd') { ?>
-						<a href="<?php echo site_url($id)."/" ?>" class="btn btn-default" rel="tooltip" title="Render as Code">Code</a>
-					<?php } else { ?>
-						<a href="<?php echo site_url($id."/rmd") ?>" class="btn btn-default" rel="tooltip" title="Render as Markdown">Markdown</a>
-					<?php } ?>
+						<div class="modal-body">
+							<table class="table">
+								<tr>
+									<td style="border:0;">Filename:</td>
+									<td style="border:0;"><?php echo htmlspecialchars($filedata["filename"]) ?></td>
+								</tr>
+								<tr>
+									<td>Size:</td>
+									<td><?php echo format_bytes($filedata["filesize"]) ?></td>
+								</tr>
+								<tr>
+									<td>Mimetype:</td>
+									<td><?php echo $filedata["mimetype"] ?></td>
+								</tr>
+								<tr>
+									<td>Uploaded:</td>
+									<td><?php echo date("r", $filedata["date"]) ?></td>
+								</tr>
+								<tr>
+									<td>Removal:</td>
+									<td><?php echo $timeout ?></td>
+								</tr>
+							</table>
+						</div>
+						<div class="modal-footer">
+							<?php echo form_open("file/do_delete/", array("style" => "display: inline")); ?>
+								<input type="hidden" name="ids[<?php echo $id; ?>]" value="<?php echo $id; ?>">
+								<button class="btn btn-danger pull-left" aria-hidden="true">Delete</button>
+							</form>
+							<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+						</div>
+					</div>
 				</div>
-			</div>
-		</div>
+			</div> <!-- .modal -->
 		<div>
-- 
cgit v1.2.3-24-g4f1b