Merge pull request #29 from nebojsatomic/new-default-templates

First new-default-templates merge, for the version 24.05

src/app/Http/Middleware/VerifyCsrfToken.php

@@ -12,7 +12,7 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        // exclude routes that are passed to Zend framework
+        // exclude routes that are passed to Zend Framework, once the app is fully migrated to Laravel this should be removed
         'creator/*',
         'pages/*',
         'page/*',
@@ -21,6 +21,7 @@ class VerifyCsrfToken extends Middleware
         'menu/*',
         'category/*',
         'modules/*',
-        'tables/*'
+        'tables/*',
+        'user/*'
     ];
 }

src/legacy/dev-application/controllers/SearchController.php

@@ -210,8 +210,8 @@ private function _renderSearch($hits, $what = null)
         $db = Zend_Registry::get('db');
         $themePath = NET_PATH . "widgets/";
         $host = NetActionController::$hostRW;
-  
-        
+
+
         $view = new Zend_View();
         $view->addScriptPath($themePath . "templates/");
 
@@ -224,21 +224,18 @@ private function _renderSearch($hits, $what = null)
         $Search['hits'] = $paginator;
         $Search['pageNumber'] = $pageNumber;
         $Search['itemCountPerPage'] = 10;
-
-
-
+
         //$Search['hits'] = $hits;
         $Search['keyword'] = $what;
         $Search['host'] = $host;
-        
+
         $view->assign($Search);
         $scriptName = "search.phtml";
 
         $partialOutput = $view->render($scriptName);
 
         return $partialOutput;
-
-
+
     }
 
     public static function showSearchForm()
@@ -277,19 +274,16 @@ public static function _searchForm()
                     'required' => true,
                     'filters' => array('Alnum'),
                     'value' => $translator->_('Search'),
-                    'class' => 'searchinput'
+                    'class' => 'searchinput input input-sm'
                 )),
                 'submitSearch' => array('submit', array(
                     'label' => '',
-                    'style' => 'float:right;',//background:url(' . self::$host . 'images/btnSearch.png) no-repeat',
+                    'class' => 'hidden',
                     'order' => 100,
                 ))
-
         )));
 
         return $form;
-
-
     }
 
     /**

src/legacy/dev-application/controllers/UserController.php

@@ -395,7 +395,7 @@ private static function userLoginForm()
             'elements' => array(
                 'username' => array('text', array(
                     'required' => true,
-                    'value' => $translator->_('username'),
+                    //'value' => $translator->_('username'),
                 )),
                 'password' => array('password', array(
                     'required' => true,
@@ -634,11 +634,11 @@ private static function _passwordReminderForm() {
             'elements' => array(
                 'username' => array('text', array(
                     'required' => true,
-                    'value' => $translator->_('Username'),
+                    //'value' => $translator->_('Username'),
                 )),
                 'email' => array('text', array(
                     'required' => true,
-                    'value' => $translator->_('E-mail'),
+                    //'value' => $translator->_('E-mail'),
                     'validators' => array('EmailAddress'),
                 )),
 

src/legacy/dev-application/controllers/ViewController.php

@@ -458,8 +458,11 @@ public static function displayMenu($menuQ, $orientation = null, $lC = null)
                 if (!$acl->has('page:' . $menuQR['cid'])) {
                     $acl->add(new Zend_Acl_Resource('page:' . $menuQR['cid'] ));//make sure resource exists
                 }
-                if(@in_array('page:' . $menuQR['cid'], $allowArray[$curRole] ) ){
-                    $acl->allow($curRole, 'page:' . $menuQR['cid'] );
+
+                if(!empty($allowArray[$curRole])) { // MUST RECHECK this behaviour
+                    if(@in_array('page:' . $menuQR['cid'], $allowArray[$curRole]) ){
+                        $acl->allow($curRole, 'page:' . $menuQR['cid'] );
+                    }
                 }
 
                 if($menuQR['check_access'] == '1') {

src/legacy/dev-application/layouts/scripts/main-creator.phtml

@@ -44,18 +44,22 @@
   <link type="text/css" href="/css/jqUI/ui.all.css" rel="stylesheet" />
   <link type="text/css" href="/css/defaultWidgets.css" rel="stylesheet" />
   <!--themes for the objects-->
-  <link type="text/css" href="/css/themes.css" rel="stylesheet" />
+<!--<link type="text/css" href="/css/themes.css" rel="stylesheet" />
+-->
   <link rel="shortcut icon" type="image/x-icon" href="/images/ide21logo.svg">
   <link rel="stylesheet" href="/css/uniform/css/uniform.aristo.css" media="screen" />
   <!-- Add fancyBox
   <link rel="stylesheet" href="<?php echo $this->host;?>fancybox/2/jquery.fancybox.css" type="text/css" media="screen" />-->
 
 
   <!--<link href="/daisy/daisyui.full.min.css" rel="stylesheet" type="text/css" />-->
-  <link href="/css/tailwind.output.css" rel="stylesheet" type="text/css" />
+  <link href="/css/tailwind.output.css?rnd=<?php echo rand();?>" rel="stylesheet" type="text/css" />
   <script src="/daisy/daisyui.tailwind.3.4.3.js"></script>
 
-
+  <!-- native browser scrollbars are too thin on mobile -->
+  <link rel="stylesheet" href="/simplebar/simplebar.css" />
+  <script src="/simplebar/simplebar.min.js"></script>
+
   <script type="text/javascript" >
   absoluteUrl = "<?php echo $this->hostRW;?>";
   absoluteUrl2 = "<?php echo $this->host;?>";
@@ -91,10 +95,10 @@
   <script type="text/javascript" src="/fancybox/2/jquery.fancybox.js"></script>
   <?php echo $this->headScript(); ?>
 </head>
-<body class="overflow-hidden">
+<body id="body" class="overflow-hidden">
   <!-- top panel -->
-  <div class="navbar bg-neutral min-h-12 h-12 relative" style="z-index:999999;">
-    <div class="navbar-start flex gap-2 md:gap-4">
+  <div id="creator-header-navbar" class="navbar bg-neutral min-h-16 h-16 relative" style="z-index:999999;">
+    <div class="navbar-start flex gap-1 md:gap-2">
       <!--<div class="dropdown">
         <div tabindex="0" role="button" class="btn btn-sm btn-ghost btn-circle text-white">
           <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h7" /></svg>
@@ -146,10 +150,28 @@
         <button id="upB"></button> <button id="downB"></button>
       </div> -->
     </div>
-    <div class="navbar-center hidden md:flex w-8 ">
+    <div class="navbar-center hidden sm:flex text-base text-white font-semibold w-8">
       <!--<img alt="IDE21 Logo" src="/images/ide21logo.svg">-->
+      <div><?php echo str_replace('Ver.', '', $this->version);?></div>
     </div>
     <div class="navbar-end flex gap-2">
+      <div>
+        <a id="fsbuttonAll" class="help fsbutton w-8 text-white" href="#">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
+            <path fill-rule="evenodd" d="M15 3.75a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0V5.56l-3.97 3.97a.75.75 0 1 1-1.06-1.06l3.97-3.97h-2.69a.75.75 0 0 1-.75-.75Zm-12 0A.75.75 0 0 1 3.75 3h4.5a.75.75 0 0 1 0 1.5H5.56l3.97 3.97a.75.75 0 0 1-1.06 1.06L4.5 5.56v2.69a.75.75 0 0 1-1.5 0v-4.5Zm11.47 11.78a.75.75 0 1 1 1.06-1.06l3.97 3.97v-2.69a.75.75 0 0 1 1.5 0v4.5a.75.75 0 0 1-.75.75h-4.5a.75.75 0 0 1 0-1.5h2.69l-3.97-3.97Zm-4.94-1.06a.75.75 0 0 1 0 1.06L5.56 19.5h2.69a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75v-4.5a.75.75 0 0 1 1.5 0v2.69l3.97-3.97a.75.75 0 0 1 1.06 0Z" clip-rule="evenodd"></path>
+          </svg>
+        </a>
+      </div>
+      <div id="p_t_common" class="noAjaxEvent grid grid-cols-2 item-strech items-center h-6 text-white px-2">
+        <div class="col-span-2 grid-cols-2 grid justify-items-center gap-2">
+          <span><input id="pageDisplayer" class="noAjaxEvent help radio-sm" type="radio" name="p_g" value="pageEditing" checked="checked" title="<?php echo $this->translate->_("Page creating Mode");?>" /></span>
+          <span><input  id="templateDisplayer" class="noAjaxEvent help radio-sm" type="radio" name="p_g" value="templateEditing" title="<?php echo $this->translate->_("Template creating Mode");?>" /></span>
+        </div>
+        <div id="p_t-label" class="text-white col-span-2 justify-items-between text-center">
+          <span id="p_t-label-page" class="hidden"><?php echo $this->translate->_("Page");?></span>
+          <span id="p_t-label-template" class="hidden"><?php echo $this->translate->_("Template");?></span>
+        </div>
+      </div>
       <div class="dropdown" style="z-index:9;">
         <div tabindex="0" role="button" class="btn btn-sm min-h-8 h-8 w-8 rounded-full">
           <svg width="12px" height="12px" class="h-2 w-2 fill-current opacity-60 inline-block" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2048 2048"><path d="M1799 349l242 241-1017 1017L7 590l242-241 775 775 775-775z"></path></svg>

src/legacy/dev-application/layouts/scripts/main.phtml

@@ -17,7 +17,7 @@
 */
 ?>
 <!DOCTYPE html>
-<html data-theme="retro">
+<html class="min-h-dvh h-full" data-theme="nord">
 <head>
   <meta name="keywords" content="<?php echo $this->meta_keywords;?>" />
   <meta name="description" content="<?php echo $this->meta_description;?>" />
@@ -27,11 +27,10 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title><?php echo $this->title;?></title>
   <!--themes for the objects-->
-  <link type="text/css" href="/css/combinedAll.css" rel="stylesheet" />
-  <link type="text/css" href="/css/themes.css" rel="stylesheet" />
+  <!-- <link type="text/css" href="/css/combinedAll.css" rel="stylesheet" /> -->
+  <!--<link type="text/css" href="/css/themes.css" rel="stylesheet" />-->
   <link rel="stylesheet" href="/css/default.css?rnd=<?php echo rand();?>"  /><!--CSS written in admin panel-->
   <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
-  <link rel="stylesheet" href="/css/uniform/css/uniform.aristo.css" media="screen" />
   <?php echo $this->headLink(); ?>
   <?php
   if($this->staticFilesCSS != '') {
@@ -49,27 +48,18 @@
   absoluteUrl = "<?php echo $this->host;?>";
   templateId =  "<?php echo $this->template;?>";
   </script>
-  <!--<script type="text/javascript" src="/js/cu3er/js/swfobject/swfobject.js"></script>-->
+
   <script type="text/javascript" src="/js/jquery/jquery-1.3.2.min.js"></script>
   <script type="text/javascript" src="/js/combinedAll.js" ></script>
-  <script type="text/javascript" src="/js/slide/jsCycle.js" ></script>
-  <!--<script type="text/javascript" src="/js/ga.js" ></script>-->
 
 
-  <script type="text/javascript" src="/js/js/easySlider1.5.js"></script>
-  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.5.3/jquery-ui.min.js" ></script>
-  <script type="text/javascript" src="/js/js/cufon-yui.js"></script>
-  <script type="text/javascript" src="/js/js/NaturalMed_italic_500.font.js"></script>
-  <script type="text/javascript" src="/js/js/NaturalMedBold_italic_750.font.js"></script>
-  <script type="text/javascript" src="/js/js/jquery.jcarousel.min.js"></script>
-  <script type="text/javascript" src="/js/js/cufon_replace.js"></script>
+  <!-- <script type="text/javascript" src="/js/js/easySlider1.5.js"></script> -->
+  <!-- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.5.3/jquery-ui.min.js" ></script> -->
 
-  <script type="text/javascript" src="/fancybox/jquery.fancybox-1.3.4.js"></script>
-  <script type="text/javascript"  src="/js/uniform/jquery.uniform.js"></script>
 </head>
-<body style="background:<?php echo $this->templateBodyBackground;?>;">
+<body style="background:<?php echo $this->templateBodyBackground;?>;" class="overflow-x-hidden w-full min-h-dvh h-auto bg-cover">
   <div class="top"></div>
-  <div id ="container">
+  <div id ="container" class="">
     <div id="centerWrapper" class="wrapper">
       <div id="content">
         <?php
@@ -83,7 +73,7 @@
   if(!empty($this->staticFilesJS) ){
     foreach($this->staticFilesJS as $jsFile){
       ?>
-      <script type="text/javascript" src="<?php echo $jsFile;?>"></script>
+      <!--<script type="text/javascript" src="<?php echo $jsFile;?>"></script>-->
       <?php
     }
   } else {
@@ -93,7 +83,12 @@
   }
   ?>
   <script type="text/javascript">
-  //$('select, input, textarea').livequery(function(){$(this).uniform();});
+    $('select').addClass('select-sm shadow-sm');
+    $('input').each(function(){
+      $(this).addClass('input input-sm w-full shadow-sm').attr('placeholder', $(this).attr('name'));
+    });
+    $('input[type="submit"]').addClass('btn btn-secondary shadow-lg');
+
   </script>
 </body>
 </html>

src/legacy/dev-application/views/scripts/USER_VIEWS/proba/default-blue-responsive.phtml

@@ -0,0 +1,40 @@
+<!-- this file should be editable from admin panel for the current user -->
+<style type="text/css">
+  h1 {}
+  h2 {}
+  a {}
+</style>
+<div id="ide21-default-template-blue" class="grid grid-cols-12 rounded-lg relative bg-blue-400 md:p-8 md:w-4/5 mx-auto">
+  <div class="header w-full h-auto min-h-72 overflow-hidden bg-blue-400 col-span-12">
+    <!--<img class="w-full max-w-full bg-contain" src="/images/backgrounds/vector_0012.png" alt="" />-->
+    <div id="hdr" class="hero min-h-screen" style="background-image: url(/images/backgrounds/vector_0543.jpg);">
+      <div class="hero-overlay bg-opacity-60"></div>
+      <div class="hero-content backdrop-blur-lg text-center text-neutral-content bg-neutral rounded-lg bg-opacity-70">
+        <div class="max-w-md">
+          <h1 class="mb-5 text-5xl font-bold">Hello there</h1>
+          <p class="mb-5 text-lg">Provident cupiditate voluptatem et in. Quaerat fugiat ut assumenda excepturi exercitationem quasi. In deleniti eaque aut repudiandae et a id nisi.</p>
+          <button class="btn btn-primary text-white">Get Started</button>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="col-span-6  inline-flex items-center gap-2 pl-8">{language:flags}</div><div class="col-span-6 grid items-center justify-items-end min-h-20 pr-8">{searchform}</div>
+  <div id="wrp" class="grid grid-cols-12 col-span-12">
+    <div id="sdb" class="leftcolumn col-span-12 md:col-span-4 bg-blue-200 p-8">
+      <div id="t1menu" >{menu:display:1:vertical}</div>
+      <div>{liveblock:user:loginArea}</div>
+      <div>
+        <p>{adminurl}</p>
+      </div>
+    </div>
+    <div id="cnt" class="sheet col-span-12 md:col-span-8 bg-blue-100 p-8">
+      <div class=""><h1 class="text-2xl">{title}</h1></div>
+      <div class="">{content}</div>
+    </div>
+  </div>
+  <div id="ftr" class="col-span-12 bg-blue-400 p-8">
+    <div>
+      <p>Copyright © 2010-present Nebojsa Tomic | Powered by <a href="#" target="_blank">IDE21</a></p>
+    </div>
+  </div>
+</div>