Browse Source

Work on the topbar

Nathaniel van Diepen 10 years ago
parent
commit
22bdae30a0
6 changed files with 22 additions and 10 deletions
  1. 1 0
      api.php
  2. 1 1
      data/topbars/back.template
  3. 2 2
      data/topbars/default.template
  4. 3 3
      data/topbars/messages.template
  5. 2 4
      index.php
  6. 13 0
      js/index.js

+ 1 - 0
api.php

@@ -13,6 +13,7 @@
 						'type'=>'pages',
 						'name'=>'user'
 					);
+					$ret['topbar'] = 'back';
 					if($user = userObj($id)){
 						$context = array(
 							'name'=>$user['name'],

+ 1 - 1
data/topbars/back.template

@@ -1,4 +1,4 @@
-<a id="btn-lists-back" href="#">
+<a id="btn-lists-back">
 	<span class="icon icon-back">
 		back
 	</span>

+ 2 - 2
data/topbars/default.template

@@ -1,9 +1,9 @@
-<a href="#">
+<a>
 	<span class="icon icon-menu">
 		hide sidebar
 	</span>
 </a>
-<a href="#drawer">
+<a>
 	<span class="icon icon-menu">
 		show sidebar
 	</span>

+ 3 - 3
data/topbars/messages.template

@@ -1,15 +1,15 @@
-<a id="btn-lists-back" href="#">
+<a id="btn-lists-back">
 	<span class="icon icon-back">
 		back
 	</span>
 </a>
 <menu type="toolbar">
-	<a href="#">
+	<a>
 		<span class="icon icon-edit">
 			edit
 		</span>
 	</a>
-	<a href="#">
+	<a>
 		<span class="icon icon-add">
 			add
 		</span>

+ 2 - 4
index.php

@@ -183,9 +183,7 @@
 			</div>
 		</div>
 		<script src="js/status.js" defer="" type="text/javascript"></script>
-
-<script src="js/seekbars.js" defer="" type="text/javascript"></script>
-
-<script src="js/app.js" defer="" type="text/javascript"></script>
+		<script src="js/seekbars.js" defer="" type="text/javascript"></script>
+		<script src="js/app.js" defer="" type="text/javascript"></script>
 	</body>
 </html>

+ 13 - 0
js/index.js

@@ -307,6 +307,19 @@
 					$('#topbar').find('.topbar-history').hide();
 				}
 				$('#topbar').addClass('overflow-hide');
+				$('#topbar .icon-back').click(function(){
+					back();
+				});
+				$('#topbar .icon-menu').click(function(){
+					if($('#drawer').hasClass('open')){
+						$('#drawer').removeClass('open').css('transform','');
+					}else{
+						$('#drawer').addClass('open').css('transform','translateX(80%)');
+					}
+				});
+				$('#topbar .icon-new').click(function(){
+					action('new');
+				});
 				//render.refresh('#topbar');
 			},
 			content: function(t,c){