Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
Framework
/
urfatBro
2
0
Haarauta 0
Tiedostot Esitykset 1 Vetopyynnöt 0 Wiki
Selaa lähdekoodia

Updates from hell

ahwelp 5 vuotta sitten
vanhempi
df312bdc1b
sitoutus
aef7351b61
8 muutettua tiedostoa jossa 120 lisäystä ja 68 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 20 0
      app/core/template/Output.class.php
  2. 23 14
      app/core/template/classes/dashboard/template.html
  3. 11 0
      app/core/welcome/WellcomeController.php
  4. 48 28
      public/dist/style.css
  5. 13 18
      public/dist/themes/black_and_white.css
  6. 3 2
      public/plugins/bootstrap/bootstrap.min.css
  7. 0 4
      public/plugins/bootstrap/bootstrap.min.js
  8. 2 2
      publiclib.php

+ 20 - 0
app/core/template/Output.class.php
Näytä tiedosto 

@@ -87,4 +87,24 @@ class Output {
 
         $class->setView($instance->view)->render();
 
 
     }
 
+
 
+    public static function addMenu($route, $name, $icon = '', $attributes = [], $weight = 0){
 
+        global $SIDEBAR;
 
+        $SIDEBAR->add($route, $name, $icon, $attributes, $weight);
 
+    }
 
+
 
+    public static function addSubmenu($key, $name, $icon = '', $attributes = [], $weight = 0){
 
+        global $SIDEBAR;
 
+        $SIDEBAR->create_submenu($key, $name, $icon, $attributes , $weight);        
+    }
 
+    
+    public static function addOnSubmenu($key, $route, $name, $icon = '', $attributes = [], $weight = 0){
 
+        global $SIDEBAR;
 
+        $SIDEBAR->add_on_new($key, $route, $name, $icon, $attributes, $weight);
 
+    }
 
+    
+    public static function icon($icon){
 
+        return "<i class='$icon' aria-hidden='true'></i>";
 
+    }
 
+
 
 }

+ 23 - 14
app/core/template/classes/dashboard/template.html
Näytä tiedosto 

@@ -7,19 +7,17 @@
 
 
     <body>
 
         <div id="wrapper">
 
-            <!-- Sidebar -->
 
             <!-- Sidebar -->
 
             <nav id="sidebar-wrapper">
 
                 <div class="logo" style="">
 
                     <img src='/media/logo_white.png' alt="logo" />
 
                 </div>
 
-                <!-- <div class="search-nav" style="">
 
+                <div class="search-nav" style="">
 
                     <input class="form-control" type="text" placeholder="Busca"/>
 
-                </div> -->
 
-
 
-                <hr />
 
+                </div>
 
 
                 {{elements}}
 
+
 
                 <ul id="side-second-menu" class="hidden nav">
 
                 </ul>
 
             </nav>
 
@@ -29,7 +27,8 @@
 
             <!-- Page Content -->
 
             <div id="main-page-wrapper">
 
 
-                <header style='min-height: 50px; background-color: #000;'>
 
+                <header class='navbar navbar-default navbar-fixed-top' style='min-height: 50px; background-color: #000;'>
 
+
 
                     <ul class="nav navbar-nav navbar-left">
 
                         <li class="tooltip-sidebar-toggle">
 
                             <a href="" id="menu-toggle">
 
@@ -37,21 +36,31 @@
 
                             </a>
 
                         </li>
 
                     </ul>
 
-                    <!-- <ul id='menu-usuario' class="nav navbar-nav navbar-right nav-dropdown">
 
-                        <li class="dropdown">
 
-                            <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" data-method="reload">
 
-                                <i class="fa fa-user" aria-hidden="true"></i> <span class="caret"></span>
 
+                    
+                    <ul class="nav navbar-top-links navbar-right">
 
+                        <!--{{usermenu}}-->
 
+                        <li class="nav-item dropdown no-arrow">
 
+                            <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 
+                                <i class="fa fa-user fa-fw"></i>
 
                             </a>
 
-                            {{usermenu}}
 
+                            <div class="dropdown-menu dropdown-menu-right" >
 
+                                <a class="dropdown-item" href="#">Profile</a>
 
+                                <a class="dropdown-item" href="#"><i class=""></i>Settings</a>
 
+                                <a class="dropdown-item" href="#"><i class=""></i>Activity Log</a>
 
+                                <div class="dropdown-divider"></div>
 
+                                <a class="dropdown-item" href="#" ><i class=""></i>Logout</a>
 
+                            </div>
 
                         </li>
 
-                    </ul> -->
 
+                    </ul>
 
+
 
                 </header>
 
 
                 <div id="progress" class="progress hidden" >
 
                     <div class="progress-bar progress-bar-striped progress-bar-animated active" style="width: 100%;"></div>
 
                 </div>
 
-                <!-- BreadCrumbs -->
 
 
+                <!-- BreadCrumbs -->
 
+                <div class='breadcrumb'>{{breadcrumb}}</div>
 
                 <!-- /BreadCrumbs -->
 
 
                 <div id="page-content-wrapper">
 
@@ -70,4 +79,4 @@
 
         <div id="modal" class="modal fade" role="dialog">  </div>
 
         {{footer}}
 
     </body>
 
-</html>    
+</html>

+ 11 - 0
app/core/welcome/WellcomeController.php
Näytä tiedosto 

@@ -0,0 +1,11 @@
 
+<?php
 
+
 
+use RR\Response as R;
 
+
 
+class WellcomeController{
 
+
 
+    function welcome(){
 
+        R::json(Array('message' => Lang::getString('welcome', 'welcome')))->send()->done();
 
+    }
 
+
 
+}

+ 48 - 28
public/dist/style.css
Näytä tiedosto 

@@ -34,6 +34,7 @@ body{
 
 /*
 
 -------------------------------------------------------
 
 */
 
+
 
 textarea{
 
     resize: vertical;
 
     min-height: 200px
 
@@ -55,6 +56,13 @@ textarea{
 
     white-space: nowrap;
 
 }
 
 
+/* BreadCrumbs -------------------------------- */
 
+
 
+.breadcrumb{
 
+    width:100%; 
+    background-color:#ddd;
 
+}
 
+
 
 /*
 
    _____ _____ _____  ______ ____          _____   
   / ____|_   _|  __ \|  ____|  _ \   /\   |  __ \  
@@ -78,7 +86,6 @@ textarea{
 
 }
 
 
 #sidebar-wrapper {
 
-    /*z-index: 1000;*/
 
     position: fixed;
 
     left: 250px;
 
     width: 0;
 
@@ -107,9 +114,12 @@ textarea{
 
     margin-right: -250px;
 
 }
 
 
-/*
 
--------------------------------------------------------
 
-*/
 
+.nav-item .in{
 
+    display: block !important;
 
+}
 
+
 
+
 
+/* ------------------------------------------------------- */
 
 .logo{
 
     text-align: center; 
     margin-top: 15px;
 
@@ -118,31 +128,40 @@ textarea{
 
 .logo > img {
 
     width:50%;
 
 }
 
-/*
 
--------------------------------------------------------
 
-*/
 
 
-/*
 
--------------------------------------------------------
 
-*/
 
+/*-------------------------------------------------------*/
 
+
 
 .search-nav{
 
-    padding: 10px;
 
     text-align: center;
 
+    margin-bottom:15px;
 
 }
 
 
 .search-nav > input{
 
     margin: 0 auto;    
-    width: 95%;
 
     border-radius: 0px;
 
 }
 
-/*
 
--------------------------------------------------------
 
-*/
 
 
-/*
 
- *-----------------------------------------------------
 
- *Sidebar responsiveness 
-*/
 
+#side-second-menu{
 
+    display:none;
 
+}
 
+
 
+#side-menu li, #side-second-menu li{
 
+    width:100%;
 
+}
 
+
 
+#side-menu li a, #side-second-menu li a{
 
+    font-size: 1.1em;
 
+}
 
+
 
+#side-menu li i, #side-second-menu li i{
 
+    margin-right: 10px;
 
+}
 
+
 
+.nav-dropdown{
 
+    margin-right: 20px !important;    
+}
 
+
 
+/* Sidebar responsiveness */
 
 @media(min-width:768px) {
 
     #wrapper {
 
         padding-left: 250px;
 
@@ -171,15 +190,7 @@ textarea{
 
     }
 
 }
 
 
-/*
 
-  _    _ ______     ^     _____  ______ _____  
- | |  | |  ____|   / \   |  __ \|  ____|  __ \ 
- | |__| | |__     /   \  | |  | | |__  | |__) |
 
- |  __  |  __|   / /_\ \ | |  | |  __| |  _  / 
- | |  | | |____ / _____ \| |__| | |____| | \ \ 
- |_|  |_|______/_/     \_\_____/|______|_|  \_\
 
-                                              
-*/
 
+/* Header ---------------------------*/
 
 
 #navbar-top{
 
     min-height: 50px;
 
@@ -203,6 +214,10 @@ textarea{
 
 
 /* HELPER ---------------------------- */
 
 
+.hidden{
 
+    display:none;
 
+}
 
+
 
 .round-ball{
 
     border-radius: 60px !important;
 
     font-size: 1.5em;
 
@@ -210,4 +225,9 @@ textarea{
 
     padding: 20px;
 
     bottom: 20px;
 
     right: 20px;
 
+}
 
+
 
+@media print {    
+   #sidebar-wrapper, #header{ display: none !important; }
 
+   #wrapper { padding-left: 0px; }
 
 }

+ 13 - 18
public/dist/themes/black_and_white.css
Näytä tiedosto 

@@ -1,29 +1,24 @@
 
-
 
-
 
-#side-menu li a{
 
-    color: #fff !important;
 
-    font-size: 1.1em;
 
-}
 
-
 
-.sidebar-wrapper{
 
-
 
+#side-menu li a, #side-second-menu li a{
 
+    color: #ffffff;
 
 }
 
 
-#side-menu li a:focus, #side-menu li a:hover {
 
-    color: #000 !important;
 
-}
 
-
 
-.nav-dropdown{
 
-    margin-right: 20px !important;    
+#side-menu li a:focus, 
+#side-menu li a:hover, 
+#side-second-menu li a:focus, 
+#side-second-menu li a:hover 
+{
 
+    color: #000000 !important;
 
+    background-color: #fff !important;
 
 }
 
 
 .nav-dropdown .dropdown-toggle{
 
-    color: #fff !important;
 
+    color: #ffffff !important;
 
 }
 
 
 .nav-dropdown .dropdown-toggle:focus,
 
 .nav-dropdown .dropdown-toggle > l1 > a:focus,
 
 .nav-dropdown .dropdown-toggle:hover,
 
 .nav-dropdown .dropdown-toggle > l1 > a:hover{
 
-    color: #000 !important;
 
-}
 
+    color: #000000 !important;
 
+}
 
+

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 2
public/plugins/bootstrap/bootstrap.min.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 4
public/plugins/bootstrap/bootstrap.min.js


+ 2 - 2
publiclib.php
Näytä tiedosto 

@@ -3,7 +3,7 @@
 
 spl_autoload_register(function ($class_name) {
 
     $path = explode('\\', $class_name);
 
     $fileName = $path[sizeof($path)-1];
 
-
 
+    
     $path[sizeof($path)-1] = '';
 
 
     $path = strtolower(DIR_ROOT. implode(DIRECTORY_SEPARATOR, $path));
 
@@ -16,7 +16,7 @@ spl_autoload_register(function ($class_name) {
 
         return include strtolower($path . $fileName . '.php');
 
     }
 
 
-    include $path . $fileName . '.php';
 
+    @include $path . $fileName . '.php';
 
 });
 
 
 class Connection {

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä