[Fmsystem-commits] [16297] more on eventplanner

[sigurdne]

Revision: 16297
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16297
Author:   sigurdne
Date:     2017-02-10 10:20:27 -0500 (Fri, 10 Feb 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/phpgwapi/templates/frontend/css/frontend.css
    trunk/phpgwapi/templates/frontend/css/side-menu.css
    trunk/phpgwapi/templates/frontend/head.tpl
    trunk/registration/inc/class.uireg.inc.php
    trunk/registration/templates/base/config.tpl

Modified: trunk/phpgwapi/templates/frontend/css/frontend.css
===================================================================
--- trunk/phpgwapi/templates/frontend/css/frontend.css  2017-02-10 12:42:04 UTC 
(rev 16296)
+++ trunk/phpgwapi/templates/frontend/css/frontend.css  2017-02-10 15:20:27 UTC 
(rev 16297)
@@ -100,7 +100,7 @@
 
 .home-menu {
     padding: 0.5em;
-    text-align: center;
+    text-align: left;
     box-shadow: 0 1px 1px rgba(0,0,0, 0.10);
 }
 .home-menu {
@@ -121,7 +121,9 @@
     font-size: 120%;
 }
 
-.home-menu .pure-menu-selected a {
+.home-menu .pure-menu-selected a,
+.home-menu .pure-menu-selected a:visited
+{
     color: white;
 }
 
@@ -135,62 +137,20 @@
     color: #AECFE5;
 }
 
+       .home-menu ul {
+               float: right;
+       }
 
-/*
- * -- SPLASH STYLES --
- * This is the blue top section that appears on the page.
- */
 
-.splash-container {
-    background: #1f8dd6;
-    z-index: 1;
-    overflow: hidden;
-    /* The following styles are required for the "scroll-over" effect */
-    width: 100%;
-    height: 88%;
-    top: 0;
-    left: 0;
-    position: fixed !important;
-}
-
-.splash {
-    /* absolute center .splash within .splash-container */
-    width: 80%;
-    height: 50%;
-    margin: auto;
-    position: absolute;
-    top: 100px; left: 0; bottom: 0; right: 0;
-    text-align: center;
-    text-transform: uppercase;
-}
-
-/* This is the main heading that appears on the blue section */
-.splash-head {
-    font-size: 20px;
-    font-weight: bold;
-    color: white;
-    border: 3px solid white;
-    padding: 1em 1.6em;
-    font-weight: 100;
-    border-radius: 5px;
-    line-height: 1em;
-}
-
-/* This is the subheading that appears on the blue section */
-.splash-subhead {
-    color: white;
-    letter-spacing: 0.05em;
-    opacity: 0.8;
-}
 .error {
-        padding: 1em;
-               padding-top: 3em;
-           background: #DD7777;
+       padding: 1em;
+       padding-top: 3em;
+       background: #DD7777;
 }
 .msg_good {
-        padding: 1em;
-               padding-top: 3em;
-           background: #66cd00;
+       padding: 1em;
+       padding-top: 3em;
+       background: #66cd00;
 }
 
 /*
@@ -225,9 +185,9 @@
 .content-subhead {
     color: #1f8dd6;
 }
-    .content-subhead i {
-        margin-right: 7px;
-    }
+.content-subhead i {
+       margin-right: 7px;
+}
 
 /* This is the class used for the dark-background areas. */
 .ribbon {
@@ -258,19 +218,25 @@
 
     }
 
+       .header1 a
+       {
+               top: 7px;
+               left: 6px;
+       }
+
     /* We can align the menu header to the left, but float the
     menu items to the right. */
     .home-menu {
         text-align: left;
     }
-        .home-menu ul {
-            float: right;
-        }
+       .home-menu ul {
+               float: right;
+       }
 
     /* We increase the height of the splash-container */
-/*    .splash-container {
-        height: 500px;
-    }*/
+       /*    .splash-container {
+                       height: 500px;
+               }*/
 
     /* We decrease the width of the .splash, since we have more width
     to work with */
@@ -296,15 +262,9 @@
  * On desktops and other large devices, we want to over-ride some
  * of the mobile and tablet styles.
  */
address@hidden (min-width: 78em) {
-    /* We increase the header font size even more */
-    .splash-head {
-        font-size: 300%;
-    }
-}
 
 .custom-menu-wrapper {
-  /*  background-color: #808080;*/
+       /*  background-color: #808080;*/
     margin-bottom: 2.5em;
     white-space: nowrap;
     position: relative;
@@ -386,7 +346,7 @@
 }
 
 .custom-menu-screen {
-   /* background-color: rgba(0, 0, 0, 0.5);*/
+       /* background-color: rgba(0, 0, 0, 0.5);*/
        background-color: #2d3e50;
     -webkit-transition: all 0.5s;
     -moz-transition: all 0.5s;
@@ -408,7 +368,18 @@
 
 @media (max-width: 62em) {
 
-    .custom-menu {
+       .content {
+        padding: 1em;
+               /*      padding-top: 3em;*/
+
+    }
+       .header1 a
+       {
+               top: 10px;
+               left: 6px;
+       }
+
+       .custom-menu {
         display: block;
     }
 
@@ -472,27 +443,27 @@
 }
 
 A {
- /* These are technically the same, but use both */
-  overflow-wrap: break-word;
-  word-wrap: break-word;
+       /* These are technically the same, but use both */
+       overflow-wrap: break-word;
+       word-wrap: break-word;
 
-  -ms-word-break: break-all;
-  /* This is the dangerous one in WebKit, as it breaks things wherever */
-  word-break: break-all;
-  /* Instead use this non-standard one: */
-  word-break: break-word;
+       -ms-word-break: break-all;
+       /* This is the dangerous one in WebKit, as it breaks things wherever */
+       word-break: break-all;
+       /* Instead use this non-standard one: */
+       word-break: break-word;
 
-  /* Adds a hyphen where the word breaks, if supported (No Blink) */
-  -ms-hyphens: auto;
-  -moz-hyphens: auto;
-  -webkit-hyphens: auto;
-  hyphens: auto;
+       /* Adds a hyphen where the word breaks, if supported (No Blink) */
+       -ms-hyphens: auto;
+       -moz-hyphens: auto;
+       -webkit-hyphens: auto;
+       hyphens: auto;
 }
 
 @media screen and (-webkit-min-device-pixel-ratio:0) {
-  select,
-  textarea,
-  input {
-    font-size: 16px;
-  }
+       select,
+       textarea,
+       input {
+               font-size: 16px;
+       }
 }
\ No newline at end of file

Modified: trunk/phpgwapi/templates/frontend/css/side-menu.css
===================================================================
--- trunk/phpgwapi/templates/frontend/css/side-menu.css 2017-02-10 12:42:04 UTC 
(rev 16296)
+++ trunk/phpgwapi/templates/frontend/css/side-menu.css 2017-02-10 15:20:27 UTC 
(rev 16297)
@@ -1,6 +1,3 @@
-body {
-    color: #777;
-}
 
 .pure-img-responsive {
     max-width: 100%;
@@ -21,60 +18,6 @@
 }
 
 /*
-This is the parent `<div>` that contains the menu and the content area.
-*/
-#layout {
-    position: relative;
-    left: 0;
-    padding-left: 0;
-}
-    #layout.active #menu {
-        left: 150px;
-        width: 150px;
-    }
-
-    #layout.active .menu-link {
-        left: 150px;
-    }
-/*
-The content `<div>` is where all your content goes.
-*/
-.content {
-    margin: 0 auto;
-    padding: 0 2em;
-    max-width: 800px;
-    margin-bottom: 50px;
-    line-height: 1.6em;
-}
-
-.header {
-     margin: 0;
-     color: #333;
-     text-align: center;
-     padding: 2.5em 2em 0;
-     border-bottom: 1px solid #eee;
- }
-    .header h1 {
-        margin: 0.2em 0;
-        font-size: 3em;
-        font-weight: 300;
-    }
-     .header h2 {
-        font-weight: 300;
-        color: #ccc;
-        padding: 0;
-        margin-top: 0;
-    }
-
-.content-subhead {
-    margin: 50px 0 20px 0;
-    font-weight: 300;
-    color: #888;
-}
-
-
-
-/*
 The `#menu` `<div>` is the parent `<div>` that contains the `.pure-menu` that
 appears on the left side of the page.
 */
@@ -91,61 +34,61 @@
     overflow-y: auto;
     -webkit-overflow-scrolling: touch;
 }
-    /*
-    All anchors inside the menu should be styled like this.
-    */
-    #menu a {
-        color: #999;
-        border: none;
-        padding: 0.6em 0 0.6em 0.6em;
-    }
+/*
+All anchors inside the menu should be styled like this.
+*/
+#menu a {
+       color: #999;
+       border: none;
+       padding: 0.6em 0 0.6em 0.6em;
+}
 
-    /*
-    Remove all background/borders, since we are applying them to #menu.
-    */
-     #menu .pure-menu,
-     #menu .pure-menu ul {
-        border: none;
-        background: transparent;
-    }
+/*
+Remove all background/borders, since we are applying them to #menu.
+*/
+#menu .pure-menu,
+#menu .pure-menu ul {
+       border: none;
+       background: transparent;
+}
 
-    /*
-    Add that light border to separate items into groups.
-    */
-    #menu .pure-menu ul,
-    #menu .pure-menu .menu-item-divided {
-        border-top: 1px solid #333;
-    }
-        /*
-        Change color of the anchor links on hover/focus.
-        */
-        #menu .pure-menu li a:hover,
-        #menu .pure-menu li a:focus {
-            background: #333;
-        }
+/*
+Add that light border to separate items into groups.
+*/
+#menu .pure-menu ul,
+#menu .pure-menu .menu-item-divided {
+       border-top: 1px solid #333;
+}
+/*
+Change color of the anchor links on hover/focus.
+*/
+#menu .pure-menu li a:hover,
+#menu .pure-menu li a:focus {
+       background: #333;
+}
 
-    /*
-    This styles the selected menu item `<li>`.
-    */
-    #menu .pure-menu-selected,
-    #menu .pure-menu-heading {
-        background: #1f8dd6;
-    }
-        /*
-        This styles a link within a selected menu item `<li>`.
-        */
-        #menu .pure-menu-selected a {
-            color: #fff;
-        }
+/*
+This styles the selected menu item `<li>`.
+*/
+#menu .pure-menu-selected,
+#menu .pure-menu-heading {
+       background: #1f8dd6;
+}
+/*
+This styles a link within a selected menu item `<li>`.
+*/
+#menu .pure-menu-selected a {
+       color: #fff;
+}
 
-    /*
-    This styles the menu heading.
-    */
-    #menu .pure-menu-heading {
-        font-size: 110%;
-        color: #fff;
-        margin: 0;
-    }
+/*
+This styles the menu heading.
+*/
+#menu .pure-menu-heading {
+       font-size: 110%;
+       color: #fff;
+       margin: 0;
+}
 
 /* -- Dynamic Button For Responsive Menu 
-------------------------------------*/
 
@@ -172,77 +115,33 @@
     padding: 2.1em 1.6em;
 }
 
-    .menu-link:hover,
-    .menu-link:focus {
-        background: #000;
-    }
+.menu-link:hover,
+.menu-link:focus {
+       background: #000;
+}
 
-    .menu-link span {
-        position: relative;
-        display: block;
-    }
+.menu-link span {
+       position: relative;
+       display: block;
+}
 
-    .menu-link span,
-    .menu-link span:before,
-    .menu-link span:after {
-        background-color: #fff;
-        width: 100%;
-        height: 0.2em;
-    }
+.menu-link span,
+.menu-link span:before,
+.menu-link span:after {
+       background-color: #fff;
+       width: 100%;
+       height: 0.2em;
+}
 
-        .menu-link span:before,
-        .menu-link span:after {
-            position: absolute;
-            margin-top: -0.6em;
-            content: " ";
-        }
+.menu-link span:before,
+.menu-link span:after {
+       position: absolute;
+       margin-top: -0.6em;
+       content: " ";
+}
 
-        .menu-link span:after {
-            margin-top: 0.6em;
-        }
+.menu-link span:after {
+       margin-top: 0.6em;
+}
 
 
-/* -- Responsive Styles (Media Queries) ------------------------------------- 
*/
-
-/*
-Hides the menu at `48em`, but modify this based on your app's needs.
-*/
address@hidden (min-width: 48em) {
-
-    .header,
-    .content {
-        padding-left: 2em;
-        padding-right: 2em;
-    }
-
-    #layout {
-        padding-left: 150px; /* left col width "#menu" */
-        left: 0;
-    }
-    #menu {
-        left: 150px;
-    }
-
-    .menu-link {
-        position: fixed;
-        left: 150px;
-        display: none;
-    }
-
-    #layout.active .menu-link {
-        left: 150px;
-    }
-}
-
address@hidden (max-width: 48em) {
-    /* Only apply this when the window is small. Otherwise, the following
-    case results in extra padding on the left:
-        * Make the window small.
-        * Tap the menu to trigger the active state.
-        * Make the window large again.
-    */
-    #layout.active {
-        position: relative;
-        left: 150px;
-    }
-}

Modified: trunk/phpgwapi/templates/frontend/head.tpl
===================================================================
--- trunk/phpgwapi/templates/frontend/head.tpl  2017-02-10 12:42:04 UTC (rev 
16296)
+++ trunk/phpgwapi/templates/frontend/head.tpl  2017-02-10 15:20:27 UTC (rev 
16297)
@@ -45,8 +45,8 @@
                                <a href="{site_url}" 
class="pure-menu-heading">{site_title}</a>
                                <ul class="pure-menu-list">
                                        <li class="pure-menu-item 
pure-menu-selected"><a href="{site_url}" 
class="pure-menu-link">{home_text}</a></li>
-                                       <li class="pure-menu-item"><a 
href="{manual_url}" class="pure-menu-link">{manual_text}</a></li>
-                                       <li class="pure-menu-item"><a 
href="{login_url}" class="pure-menu-link">{login_text}</a></li>
+                                       <li class="pure-menu-item 
pure-menu-selected"><a href="{manual_url}" 
class="pure-menu-link">{manual_text}</a></li>
+                                       <li class="pure-menu-item 
pure-menu-selected"><a href="{login_url}" 
class="pure-menu-link">{login_text}</a></li>
                                </ul>
                        </div>
                </div>

Modified: trunk/registration/inc/class.uireg.inc.php
===================================================================
--- trunk/registration/inc/class.uireg.inc.php  2017-02-10 12:42:04 UTC (rev 
16296)
+++ trunk/registration/inc/class.uireg.inc.php  2017-02-10 15:20:27 UTC (rev 
16297)
@@ -83,11 +83,14 @@
                        }
                        
$GLOBALS['phpgw']->css->add_external_file('registration/templates/base/css/rainbow_baby-blue.css');
                        phpgwapi_jquery::formvalidator_generate(array('date', 
'security'));
+
+                       $form_header = !empty($this->config['form_header']) ? 
$this->config['form_header'] : $GLOBALS['phpgw_info']['server']['system_name'];
+
                        $GLOBALS['phpgw_info']['server']['no_jscombine'] = true;
                        $this->template->set_var('css', 
$GLOBALS['phpgw']->common->get_css());
                        $this->template->set_var('javascript', 
$GLOBALS['phpgw']->common->get_javascript());
                        $this->template->set_var('str_base_url', 
$GLOBALS['phpgw']->link('/', array('logindomain' => $_REQUEST['logindomain']), 
true));
-                       $this->template->set_var('lang_header', 
$GLOBALS['phpgw_info']['server']['system_name'] . ' :: ' . $sub);
+                       $this->template->set_var('lang_header', 
"{$form_header}::{$sub}");
                        $this->template->pfp('out', 'header');
                }
 

Modified: trunk/registration/templates/base/config.tpl
===================================================================
--- trunk/registration/templates/base/config.tpl        2017-02-10 12:42:04 UTC 
(rev 16296)
+++ trunk/registration/templates/base/config.tpl        2017-02-10 15:20:27 UTC 
(rev 16297)
@@ -113,6 +113,10 @@
                        </td>
                </tr>
                <tr>
+                       <td>{lang_registration_form_header}:</td>
+                       <td><input name="newsettings[form_header]" 
value="{value_form_header}"></td>
+               </tr>
+               <tr>
                        <td>{lang_login_url}:</td>
                        <td><input name="newsettings[login_url]" 
value="{value_login_url}"></td>
                </tr>