Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: WPZ/Photka
base: fe729a286a
...
head fork: WPZ/Photka
compare: 5a91378dc8
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 5 files changed
  • 0 commit comments
  • 2 contributors
Commits on Apr 11, 2012
Warsztaty programowania zespołowego Panel w backendzie. 5fb3dec
Commits on Apr 12, 2012
ciembor Menu zalogowanego uzytkownika, wylogowywanie. 5a91378
View
2  photka/apps/backend/config/view.yml
@@ -12,7 +12,7 @@ default:
#language: en
#robots: index, follow
- stylesheets: [main.css]
+ stylesheets: [bootstrap.css]
javascripts: []
View
16 photka/apps/frontend/templates/layout.php
@@ -73,8 +73,6 @@
<li class="active"><a href="./index.php">Strona główna</a></li>
</ul>
<div id="panel-right" class="pull-right">
- <a id="btn-register" class="btn btn-info" href="<?php echo url_for('sfApply/apply'); ?>">zarejestruj</a>
- <a id="btn-login" class="btn btn-warning" data-toggle="modal" href="#logowanie">zaloguj</a>
<form id="search-bar" class="form-horizontal">
<div class='input-append'>
<input placeholder="wpisz szukaną frazę" />
@@ -83,6 +81,20 @@
</button>
</div>
</form>
+ <?php if ($sf_user->isAuthenticated()): ?>
+ <div class="btn-group">
+ <button id="btn-user" class="btn btn-success"><?php echo($sf_user->getUsername()); ?></button>
+ <button class="btn dropdown-toggle btn-success" data-toggle="dropdown">
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ <li><a href="<?php echo url_for('guard/logout');?>">wyloguj</a></li>
+ </ul>
+ </div>
+ <?php else: ?>
+ <a id="btn-register" class="btn btn-info" href="<?php echo url_for('sfApply/apply'); ?>">zarejestruj</a>
+ <a id="btn-login" class="btn btn-warning" data-toggle="modal" href="#logowanie">zaloguj</a>
+ <?php endif ?>
</div>
<!-- <p class="navbar-text pull-right">zalogowany jako: <a href="#">username</a></p> -->
</div>
View
1  photka/config/.gitignore
@@ -0,0 +1 @@
+databases.yml
View
4 photka/config/databases.yml
@@ -6,5 +6,5 @@ all:
class: sfDoctrineDatabase
param:
dsn: mysql:host=localhost;dbname=photka
- username: photka
- password: photka
+ username: wpz
+ password: photka007
View
21 photka/web/css/photka.css
@@ -13,8 +13,7 @@ body {
}
#search-bar {
- margin-top: 5px;
- margin-bottom: 0px;
+ margin: 5px 0 0 20px;
float: right;
}
@@ -74,3 +73,21 @@ body {
.container > hr {
margin-top: 35px;
}
+
+#panel-right > .btn, #panel-right > .btn-group {
+ float: right;
+}
+
+#btn-login {
+ margin-right: 6px;
+}
+
+#panel-right .dropdown-toggle {
+ height: 28px;
+ padding-bottom: 8px;
+}
+
+#panel-right ul {
+ margin-top: 5px;
+ z-index: -1;
+}

No commit comments for this range

Something went wrong with that request. Please try again.