gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 04:31:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-06-22 10:01:31 +02:00
commit d1b967e9f3
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
views/bootstrap/class.Bootstrap.php
View File

@ -285,6 +285,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo "<div class=\"navbar navbar-inverse navbar-fixed-top\">\n"; echo "<div class=\"navbar navbar-inverse navbar-fixed-top\">\n";
echo " <div class=\"navbar-inner\">\n"; echo " <div class=\"navbar-inner\">\n";
echo " <div class=\"container-fluid\">\n"; echo " <div class=\"container-fluid\">\n";
echo " <a href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap/images/seeddms-logo.svg">')."</a>";
echo " <a class=\"brand\" href=\"../out/out.ViewFolder.php\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n"; echo " <a class=\"brand\" href=\"../out/out.ViewFolder.php\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
echo " </div>\n"; echo " </div>\n";
echo " </div>\n"; echo " </div>\n";
@ -375,8 +376,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo " <a class=\"btn btn-navbar\" href=\"../op/op.Logout.php\">\n"; echo " <a class=\"btn btn-navbar\" href=\"../op/op.Logout.php\">\n";
echo " <span class=\"fa fa-sign-out\"></span>\n"; echo " <span class=\"fa fa-sign-out\"></span>\n";
echo " </a>\n"; echo " </a>\n";
if(!empty($this->extraheader['favicon']))
echo $this->extraheader['favicon'];
echo " <a href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap/images/seeddms-logo.svg">')."</a>"; echo " <a href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap/images/seeddms-logo.svg">')."</a>";
echo " <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><span class=\"hidden-phone\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n"; echo " <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><span class=\"hidden-phone\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";

7
views/bootstrap/class.Login.php
View File

@ -98,6 +98,7 @@ $(document).ready( function() {
$this->htmlStartPage(getMLText("sign_in"), "login"); $this->htmlStartPage(getMLText("sign_in"), "login");
$this->globalBanner(); $this->globalBanner();
$this->contentStart(); $this->contentStart();
echo "<div id=\"login_wrapper\">\n";
$this->pageNavigation(getMLText("sign_in")); $this->pageNavigation(getMLText("sign_in"));
if($msg) if($msg)
$this->errorMsg(htmlspecialchars($msg)); $this->errorMsg(htmlspecialchars($msg));
@ -115,7 +116,7 @@ $(document).ready( function() {
'type'=>'text', 'type'=>'text',
'id'=>'login', 'id'=>'login',
'name'=>'login', 'name'=>'login',
'placeholder'=>'login', 'placeholder'=>getMLText('user_login'),
'autocomplete'=>'on', 'autocomplete'=>'on',
'required'=>true 'required'=>true
) )
@ -127,6 +128,7 @@ $(document).ready( function() {
'type'=>'password', 'type'=>'password',
'id'=>'pwd', 'id'=>'pwd',
'name'=>'pwd', 'name'=>'pwd',
'placeholder'=>getMLText('password'),
'autocomplete'=>'off', 'autocomplete'=>'off',
'required'=>true 'required'=>true
) )
@ -169,8 +171,8 @@ $(document).ready( function() {
$html $html
); );
} }
$this->contentContainerEnd();
$this->formSubmit(getMLText('submit_login')); $this->formSubmit(getMLText('submit_login'));
$this->contentContainerEnd();
?> ?>
</form> </form>
<?php <?php
@ -184,6 +186,7 @@ $(document).ready( function() {
print implode(' | ', $tmpfoot); print implode(' | ', $tmpfoot);
print "</p>\n"; print "</p>\n";
} }
echo "</div>\n";
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */

13
views/bootstrap4/styles/application.css
View File

@ -1,9 +1,18 @@
body { /* Add top padding for full-width layout */ body { /* Add top padding for full-width layout */
padding-top: 4.0rem; padding-top: 3.7rem;
}
#login_wrapper {
margin: auto auto;
width: 360px;
}
@media (max-width: 575px) {
#login_wrapper {
width: 100%;
}
} }
a.navbar-brand img { a.navbar-brand img {
height: 2.3rem; height: 2.0rem;
} }
.dropdown-submenu { .dropdown-submenu {

4
views/bootstrap4/styles/styles.css
View File

@ -1,7 +1,3 @@
.navbar-brand img {
height: 2.3rem;
}
ul.jqtree-tree ul.jqtree_common { ul.jqtree-tree ul.jqtree_common {
margin-left: 22px; margin-left: 22px;
} }