]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b0dd6f)
restore nav element to login pages, since system messages are sent in it
authorZach Prezkuta <fermion@gmx.com>
Sat, 25 Aug 2012 16:08:25 +0000 (10:08 -0600)
committerZach Prezkuta <fermion@gmx.com>
Sat, 25 Aug 2012 16:08:25 +0000 (10:08 -0600)
view/theme/frost-mobile/default.php patch | blob | history
view/theme/frost-mobile/login-style.css patch | blob | history
view/theme/frost/default.php patch | blob | history
view/theme/frost/login-style.css patch | blob | history

diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php
index 99f96f4b6869cc4e008cafe1a7c5edb3268b82aa..b7feae3716f1583d78f4326c703ff88b606f2b3c 100644 (file)
--- a/view/theme/frost-mobile/default.php
+++ b/view/theme/frost-mobile/default.php
@@ -6,23 +6,23 @@
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
 </head>\r
 <body>\r
+       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
+\r
        <?php if( $a->module === 'home' ) { ?>\r
        <center>\r
        <div class="login-button">\r
        <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>\r
        </div>\r
        </center>\r
+\r
        <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {\r
        ?>\r
-\r
        <div class='section-wrapper'>\r
        <section><?php if(x($page,'content')) echo $page['content']; ?>\r
        </section>\r
        </div>\r
 \r
-       <?php } else {\r
-\r
-       if(x($page,'nav')) echo $page['nav']; ?>\r
+       <?php } else { ?>\r
        <div class='main-container'>\r
                <div class='main-content-container'>\r
                <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>\r
diff --git a/view/theme/frost-mobile/login-style.css b/view/theme/frost-mobile/login-style.css
index 618e07c0cbe9577262d772d73a9930f14d0ba31b..5c07aba77222008280030daf43b3ec687485960d 100644 (file)
--- a/view/theme/frost-mobile/login-style.css
+++ b/view/theme/frost-mobile/login-style.css
@@ -15,6 +15,26 @@ a:hover {text-decoration: underline; }
 
 img { border :0px; }
 
+nav {
+       display: none;
+}
+
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+#jGrowl.top-right {
+       top: 15px;
+       right: 15px;
+}
+
 .login-button {
        margin-top: 90px;
        margin-left: auto;
diff --git a/view/theme/frost/default.php b/view/theme/frost/default.php
index 9f764c73ef06e0eb78889093042c79c8b5672777..aa032524f8484aaeb803ba9ec8bf279fcd023e81 100644 (file)
--- a/view/theme/frost/default.php
+++ b/view/theme/frost/default.php
@@ -6,23 +6,23 @@
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
 </head>\r
 <body>\r
+       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
+\r
        <?php if( $a->module === 'home' ) { ?>\r
        <center>\r
        <div class="login-button">\r
        <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>\r
        </div>\r
        </center>\r
+\r
        <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {\r
        ?>\r
-\r
        <div class='section-wrapper'>\r
        <section><?php if(x($page,'content')) echo $page['content']; ?>\r
        </section>\r
        </div>\r
 \r
-       <?php } else {\r
-\r
-       if(x($page,'nav')) echo $page['nav']; ?>\r
+       <?php } else { ?>\r
        <div class='main-container'>\r
                <!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->\r
                <div class='main-content-container'>\r
diff --git a/view/theme/frost/login-style.css b/view/theme/frost/login-style.css
index 3b9a9eb82b388682bca14c513b6ad89d783d7aa0..1c8c1cd45bb810b5fc9fea8896e16a0efdc146eb 100644 (file)
--- a/view/theme/frost/login-style.css
+++ b/view/theme/frost/login-style.css
@@ -12,6 +12,26 @@ a:hover {text-decoration: underline; }
 
 img { border :0px; }
 
+nav {
+       display: none;
+}
+
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+#jGrowl.top-right {
+       top: 15px;
+       right: 15px;
+}
+
 .login-button {
        margin-top: 110px;
 }
Unnamed repository; edit this file 'description' to name the repository.