Permalink
Browse files

Merge branch 'master' of github.com:iRail/PlugID

  • Loading branch information...
2 parents 988042e + 4ac1807 commit 80ae443f77111789e8d54b34c46535540f5c81dd @hannesvdvreken hannesvdvreken committed Jul 20, 2012
@@ -1,21 +1,28 @@
<div class="container">
<div class="hero-unit">
- <h2>Your authorized applications</h2>
+ <div id="form">
+ <h2>Your authorized applications</h2>
<?php echo form_open(); ?>
- <label>Name:</label>
- <?php echo form_input('name', isset($item->name) ? $item->name : '', 'class="input-xlarge"'); ?>
- <label>Client Id:</label>
- <?php echo form_input('client_id', isset($item->client_id) ? $item->client_id : '','readonly class="input-xlarge"'); ?>
- <label>Client Secret:</label>
- <?php echo form_input('client_secret', isset($item->client_secret) ? $item->client_secret : '','readonly class="input-xlarge"'); ?>
- <button class="btn btn-primary" type="submit" value="reset" name="resetSecret">Reset secret</button>
- <label>Callback URL:</label>
- <?php echo form_input('redirect_uri', isset($item->redirect_uri) ? $item->redirect_uri : '', 'class="input-xlarge"'); ?>
- <br />
- <input type="hidden" name="clientid" value="<?php echo $item->client_id ?>">
- <button class="btn btn-primary" type="submit" value="update" name="updateUri">Update client</button><br />
- <span style="display:block">&nbsp;</span>
- <button class="btn btn-primary" type="submit" value="delete" name="deleteClient">Delete client</button>
+ <label>Name:</label>
+ <?php echo form_input('name', isset($item->name) ? $item->name : '', 'class="input-xlarge"'); ?>
+ <label>Client Id:</label>
+ <?php echo form_input('client_id', isset($item->client_id) ? $item->client_id : '', 'readonly class="input-xlarge"'); ?>
+ <label>Client Secret:</label>
+ <?php echo form_input('client_secret', isset($item->client_secret) ? $item->client_secret : '', 'readonly class="input-xlarge"'); ?>
+ <button class="btn btn-primary" type="submit" value="reset" name="resetSecret">Reset secret</button>
+ <label>Callback URL:</label>
+ <?php echo form_input('redirect_uri', isset($item->redirect_uri) ? $item->redirect_uri : '', 'class="input-xlarge"'); ?>
+ <br />
+ <input type="hidden" name="clientid" value="<?php echo $item->client_id ?>">
+ <button class="btn btn-primary" type="submit" value="update" name="updateUri">Update client</button><br />
+ <span style="display:block">&nbsp;</span>
+ <button class="btn btn-primary" type="submit" value="delete" name="deleteClient">Delete client</button>
</form>
- </div>
+ </div>
+ <div id="tokens">
+ <b>Access token URL</b><br />
+ <span><?php echo site_url() ?>oauth2/access_token</span><br />
+ <b>Authorize URL</b><br />
+ <span><?php echo site_url() ?>oauth2/authorize</span>
+ </div>
</div>
@@ -1,33 +1,3 @@
-<style type="text/css">
- .sidebar-nav {
- padding: 9px 0;
- }
-
- .sidebar-nav-fixed {
- position:fixed;
- top:60px;
- width:21.97%;
- }
-
- h1 {
- word-wrap: break-word;
- }
-
- @media (max-width: 767px) {
- .sidebar-nav-fixed {
- position:static;
- width:auto;
- }
- }
-
- @media (max-width: 979px) {
- .sidebar-nav-fixed {
- top:70px;
- }
- }
-</style>
-
-
<div class="container-fluid">
<div class="row-fluid">
<div class="span3">
@@ -78,10 +48,4 @@
</div><!--/span-->
</div><!--/row-->
- <hr>
-
- <footer>
- <p>&copy; iRail 2012</p>
- </footer>
-
</div><!--/.fluid-container-->
@@ -1,44 +1,3 @@
-<style type="text/css">
- .logo {
- float: left;
- margin-right: 15px;
- }
-
- .span8 {
- margin-bottom: 25px;
- }
-
- .span8:after {
- clear:both;
- }
-
- .sidebar-nav {
- padding: 9px 0;
- }
-
- .sidebar-nav-fixed {
- position:fixed;
- top:60px;
- width:21.97%;
- }
-
- h1 {
- word-wrap: break-word;
- }
-
- @media (max-width: 767px) {
- .sidebar-nav-fixed {
- position:static;
- width:auto;
- }
- }
-
- @media (max-width: 979px) {
- .sidebar-nav-fixed {
- top:70px;
- }
- }
-</style>
<div class="container-fluid">
<div class="row-fluid">
@@ -87,7 +46,4 @@
</div>
</div><!--/row-->
- <hr>
-
-
</div><!--/.fluid-container-->
@@ -1,6 +1,8 @@
-<script src="<?php echo base_url('js/jquery.js'); ?>"></script>
<footer class="modal-footer">
<p>&copy; iRail 2012, <a href="https://github.com/iRail/PlugID">PlugID on GitHub</a></p>
</footer>
+
+<script src="<?php echo base_url('js/jquery.js'); ?>"></script>
+
</body>
</html>
@@ -1,4 +1,4 @@
-<div class="container" xmlns="http://www.w3.org/1999/html">
+<div class="container">
<div class="hero-unit">
<h1>PlugID - Alpha version</h1>
<br/>
@@ -10,9 +10,8 @@
<ul>
<li><a href="https://twitter.com/hannesvdvreken">Hannes Van De Vreken</a>(project manager)</li>
<li><a href="https://twitter.com/jenssegers">Jens Segers</a></li>
- <li><a href="https://twitter.com/lennartmart">Lennart Martens</a></li>
+ <li><a href="https://twitter.com/lennartmart">Lennart Martens</a></li>
<li><a href="https://twitter.com/koen027">Koen De Groote</a></li>
- <li><a href="https://twitter.com/SjimiTweet">Sjimi</a> (but nog really)</li>
</ul>
</p>
<p>
View
@@ -1,13 +1,13 @@
ul.nav li.dropdown:hover ul.dropdown-menu {
- display: block;
+ display: block;
}
ul.dropdown-menu {
- margin-top: -2px;
+ margin-top: -2px;
}
a.menu:after,.dropdown-toggle:after {
- content: none;
+ content: none;
}
.modal-footer{
@@ -26,15 +26,59 @@ a.menu:after,.dropdown-toggle:after {
}
#user {
- float: right;
+ float: right;
}
body {
- padding-bottom: 40px;
- padding-top: 60px;
+ padding-bottom: 40px;
+ padding-top: 60px;
+}
+.sidebar-nav {
+ padding: 9px 0;
+}
+
+.sidebar-nav-fixed {
+ position:fixed;
+ top:60px;
+ width:21.97%;
+}
+
+h1 {
+ word-wrap: break-word;
+}
+
+@media (max-width: 767px) {
+ .sidebar-nav-fixed {
+ position:static;
+ width:auto;
+ }
+}
+
+@media (max-width: 979px) {
+ .sidebar-nav-fixed {
+ top:70px;
+ }
+}
+
+.sidebar-nav {
+ padding: 9px 0;
+}
+
+.logo {
+ float: left;
+ margin-right: 15px;
}
/* Kinda dirty(so the internet says). Prevents headers from disappearing behind fixed top bar. */
:target {
- padding-top: 35px;
+ padding-top: 35px;
+}
+
+#form {
+ width: 400px;
+ display: inline-block;
+}
+#tokens {
+ float: right;
+ padding: 40px;
}

0 comments on commit 80ae443

Please sign in to comment.