summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorMarkus Cisler <m@kuchen.io>2013-09-22 14:44:46 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-09-22 16:30:56 +0200
commit21f9a779a24156c06abc38b07fc27621cd845bf7 (patch)
tree5c252b8730b9dbacf6d9e2b936c78ed1c7bf9c16 /application
parent556ca9a0c2d99dbd94028ac80aabf3dc809e76b9 (diff)
fix paste view on mobile devices
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application')
-rw-r--r--application/views/file/html_header.php174
-rw-r--r--application/views/file/upload_history_thumbnails.php2
2 files changed, 87 insertions, 89 deletions
diff --git a/application/views/file/html_header.php b/application/views/file/html_header.php
index 127668397..2c556720c 100644
--- a/application/views/file/html_header.php
+++ b/application/views/file/html_header.php
@@ -2,97 +2,95 @@
$force_full_html = true;
include(FCPATH."application/views/header.php"); ?>
- </div>
+</div>
- <script type="text/javascript">
- /* <![CDATA[ */
- window.lexers = <?php echo json_encode($lexers); ?>;
- window.paste_base = '<?php echo site_url($id) ?>';
- /* ]]> */
- </script>
+<script type="text/javascript">
+ /* <![CDATA[ */
+ window.lexers = <?php echo json_encode($lexers); ?>;
+ window.paste_base = '<?php echo site_url($id) ?>';
+ /* ]]> */
+</script>
- <?php if (isset($error_message)) { ?>
- <div class="alert alert-danger" style="text-align: center; border-radius: 0;">
- <?php echo $error_message; ?>
- </div>
- <?php } ?>
+<?php if (isset($error_message)) { ?>
+<div class="alert alert-danger" style="text-align: center; border-radius: 0;">
+ <?php echo $error_message; ?>
+</div>
+<?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>
- </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 class="container paste-container">
+ <div style="border:1px solid #ccc;">
+ <div class="navbar navbar-default navbar-static-top navbar-paste">
+ <ul class="nav navbar-nav navbar-left dont-float">
+ <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>
- </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>
- <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>
+ </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 navbar-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> <!-- .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>
+ <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> <!-- .modal -->
- <div>
+ </div>
+ </div>
+ </div> <!-- .modal -->
+ <div>
diff --git a/application/views/file/upload_history_thumbnails.php b/application/views/file/upload_history_thumbnails.php
index f21ffcb23..bcafc44ca 100644
--- a/application/views/file/upload_history_thumbnails.php
+++ b/application/views/file/upload_history_thumbnails.php
@@ -2,7 +2,7 @@
<?php echo form_open("file/do_delete/", array("id" => "delete_form", "style" => "display: inline")); ?>
<button class="btn btn-danger" id="delete_button" style="display: none">Delete selected</button>
</form>
- <button class="btn" id="toggle_delete_mode" style="display: inline">Delete mode</button>
+ <button class="btn btn-default" id="toggle_delete_mode" style="display: inline">Delete mode</button>
</div>
<?php include 'nav_history.php'; ?>