Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Nov 30, 2015
2 parents 3caaa8e + cc7289c commit c492d85
Show file tree
Hide file tree
Showing 20 changed files with 586 additions and 959 deletions.
12 changes: 12 additions & 0 deletions samples/demo/PageLogin.html
View file
Expand Up @@ -75,6 +75,18 @@
<script type="text/javascript">
$(".focus-username").focus();
</script>

<wicket:remove>This css is used to hide sidebar menu</wicket:remove>
<style type="text/css">
.content-wrapper, .right-side, .main-footer {
margin-left: 0px;

-moz-transition: none;
-webkit-transition: none;
-o-transition: color 0 ease-in;
transition: none;
}
</style>
</wicket:extend>

</body>
Expand Down
228 changes: 156 additions & 72 deletions samples/demo/PageTemplate.html
View file
Expand Up @@ -23,105 +23,189 @@
</title>
<link rel="shortcut icon" type="image/x-icon" href="img/favicon.ico"/>

<!-- TO BE REMOVED START -->
<link type="text/css" rel="stylesheet" href="css/evolveum.css"/>
<link rel="stylesheet" type="text/css" href="css/css-fixed-nonIE.css"/>
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/css-fixed-IE.css"/>
<![endif]-->
<!--[if lt IE 7]>
<link rel="stylesheet" type="text/css" href="css/css-fixed-IE.css?444"/>
<![endif]-->
<wicket:remove>
<!-- TO BE REMOVED START -->
<link type="text/css" rel="stylesheet" href="css/evolveum.css"/>
<link rel="stylesheet" type="text/css" href="css/css-fixed-nonIE.css"/>
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/css-fixed-IE.css"/>
<![endif]-->
<!--[if lt IE 7]>
<link rel="stylesheet" type="text/css" href="css/css-fixed-IE.css?444"/>
<![endif]-->

<script type="text/javascript" src="js/evolveum.js"></script>
<!-- TO BE REMOVED END -->
<script type="text/javascript" src="js/evolveum.js"></script>
<!-- TO BE REMOVED END -->


<link type="text/css" rel="stylesheet" href="wro/all.css"/>
<link type="text/css" rel="stylesheet" href="wro/all.css"/>

<!-- BOOTSTRAP RESOURCES START -->
<link type="text/css" rel="stylesheet" href="wro/bootstrap.css"/>
<!-- BOOTSTRAP RESOURCES START -->
<link type="text/css" rel="stylesheet" href="wro/bootstrap.css"/>

<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="js/support/html5shiv.js"></script>
<script src="js/support/respond.min.js"></script>
<![endif]-->
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="js/support/html5shiv.js"></script>
<script src="js/support/respond.min.js"></script>
<![endif]-->

<link type="text/css" rel="stylesheet" href="wro/bootstrap-override.css"/>
<link type="text/css" rel="stylesheet" href="wro/bootstrap-override.css"/>

<link type="text/css" rel="stylesheet" href="css/easy-pie-chart/jquery.easypiechart.css"/>
<link type="text/css" rel="stylesheet" href="css/easy-pie-chart/jquery.easypiechart.css"/>

<!--https://github.com/silviomoreto/bootstrap-select/releases-->
<link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-multiselect.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-select.css"/>
<!--https://github.com/silviomoreto/bootstrap-select/releases-->
<link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-multiselect.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-select.css"/>

<link rel="stylesheet" type="text/css" href="css/pnotify/jquery.pnotify.default.css"/>
<!--<link rel="stylesheet" type="text/css" href="css/pnotify/jquery.pnotify.default.css"/>-->

<link type="text/css" rel="stylesheet" href="css/silk.css"/>
<link type="text/css" rel="stylesheet" href="css/flag.css"/>
<link type="text/css" rel="stylesheet" href="css/font-awesome.css"/>
<link type="text/css" rel="stylesheet" href="wro/midpoint.css"/>
<link type="text/css" rel="stylesheet" href="css/silk.css"/>
<link type="text/css" rel="stylesheet" href="css/flag.css"/>
<link type="text/css" rel="stylesheet" href="css/font-awesome.css"/>
<link type="text/css" rel="stylesheet" href="wro/midpoint.css"/>

<script type="text/javascript" src="js/easy-pie-chart/jquery.easypiechart.js"></script>
<script type="text/javascript" src="wro/bootstrap.js"></script>
<script type="text/javascript" src="js/easy-pie-chart/jquery.easypiechart.js"></script>
<script type="text/javascript" src="wro/bootstrap.js"></script>

<!--https://github.com/silviomoreto/bootstrap-select/releases-->
<script type="text/javascript" src="js/bootstrap-select/bootstrap-multiselect.js"></script>
<script type="text/javascript" src="js/bootstrap-select/bootstrap-select.js"></script>
<!--https://github.com/silviomoreto/bootstrap-select/releases-->
<script type="text/javascript" src="js/bootstrap-select/bootstrap-multiselect.js"></script>
<script type="text/javascript" src="js/bootstrap-select/bootstrap-select.js"></script>

<script type="text/javascript" src="js/ace/ace.js" charset="utf-8"></script>
<script type="text/javascript" src="js/ace/ace.js" charset="utf-8"></script>

<script type="text/javascript" src="js/pnotify/jquery.pnotify.js" charset="utf-8"></script>
<!--<script type="text/javascript" src="js/pnotify/jquery.pnotify.js" charset="utf-8"></script>-->

<script type="text/javascript" src="wro/midpoint.js"></script>
<!-- BOOTSTRAP RESOURCES END -->
</head>
<body>
<div id="blackWindow"></div>
<div id="xmlExport">
<span id="xmlExportContent"></span>
</div>
<script type="text/javascript" src="wro/midpoint.js"></script>
<!-- BOOTSTRAP RESOURCES END -->
</wicket:remove>

<div wicket:id="topMenu" />
<link href="css/admin-lte/fonts.css" type="text/css" rel="stylesheet"/>

<div wicket:id="version" class="pull-right version-info">
<wicket:message key="pageBase.midPointVersion"/>
</div>
<img id="ajax_busy" class="pull-right version-info" src="img/ajax-loader.gif"/>
<wicket:link>
<link href="../../../../../webjars/adminlte/2.3.0/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../../webjars/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../../webjars/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../../webjars/adminlte/2.3.0/plugins/datatables/dataTables.bootstrap.css" rel="stylesheet" type="text/css" />
</wicket:link>

<div class="mp-main-container">
<div class="row mainContainer">
<div class="page-header" wicket:id="pageTitleContainer">
<h1 wicket:id="pageTitle">
<span wicket:id="pageTitleReal"></span>
<small wicket:id="pageSubtitle"></small>
</h1>
</div>
<link href="css/admin-lte/AdminLTE.min.css" rel="stylesheet" type="text/css" />

<!--<div wicket:id="feedbackList"/>-->
<!--<div wicket:id="feedbackDetails"/>-->
<wicket:link>
<link href="../../../../../webjars/adminlte/2.3.0/dist/css/skins/skin-blue-light.min.css" rel="stylesheet" type="text/css" />

<div wicket:id="feedbackContainer" class="feedbackContainer">
<div wicket:id="feedback" class="messagePanel"/>
<div wicket:id="tempFeedback" class="tempMessage"/>
</div>
<wicket:child/>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="../../../../../webjars/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="../../../../../webjars/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</wicket:link>

</div>
<link type="text/css" rel="stylesheet" href="css/flag.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-multiselect.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-select.css"/>

<div class="wicket-debug-buttons" wicket:id="debugBar">
<a wicket:id="clearCssCache">Clear css cache</a>
<!-- OBSOLETE START -->
<link type="text/css" rel="stylesheet" href="css/silk.css"/>
<link type="text/css" rel="stylesheet" href="wro/all.css"/>
<link type="text/css" rel="stylesheet" href="wro/midpoint.css"/>
<!-- OBSOLETE END -->
<link type="text/css" rel="stylesheet" href="wro/midpoint-theme.css"/>
</head>
<body class="skin-blue-light">
<div class="wrapper">
<header class="main-header">
<!-- Logo -->
<a class="logo" href="./">
<span>&nbsp;</span>
</a>
<!-- Header Navbar: style can be found in header.less -->
<nav role="navigation" class="navbar navbar-static-top">
<!-- Sidebar toggle button-->
<a wicket:id="menuToggle" role="button" data-toggle="offcanvas" class="sidebar-toggle" href="#">
<span class="sr-only"><wicket:message key="PageTemplate.toggleNavigation"/></span>
</a>
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu" wicket:id="rightMenu"/>
<li>
<div wicket:id="locale"/>
</li>
</ul>
</div>
</nav>
</header>
<wicket:enclosure child="sidebarMenu">
<aside class="main-sidebar">
<!-- sidebar: style can be found in sidebar.less -->
<section class="sidebar" style="height: auto;">
<wicket:container wicket:id="sidebarMenu"/>
</section>
<!-- /.sidebar -->
</aside>
</wicket:enclosure>
<div class="content-wrapper" style="min-height: 916px;">
<!-- Content Header (Page header) -->
<section class="content-header" wicket:id="pageTitleContainer">
<h1 wicket:id="pageTitle">
<span wicket:id="pageTitleReal"></span>
<small wicket:id="pageSubtitle"></small>
<img id="ajax_busy" src="img/ajax-loader.gif"/>
</h1>
<ol class="breadcrumb">
<li wicket:id="breadcrumb">
<a wicket:id="bcLink">
<i wicket:id="bcIcon"></i>&nbsp;
<span wicket:id="bcName"/>
</a>
</li>
</ol>
</section>

<!-- Main content -->
<section class="content">
<div wicket:id="feedbackContainer" class="feedbackContainer">
<div wicket:id="feedback" class="messagePanel"/>
<div wicket:id="tempFeedback" class="tempMessage"/>
</div>
<wicket:child/>

<div class="wicket-debug-buttons" wicket:id="debugBar">
<a wicket:id="clearCssCache">Clear css cache</a>
</div>
<div wicket:id="debugPanel" style="z-index: 10000;"/>
</section>
</div>
<div wicket:id="debugPanel" style="z-index: 10000;"/>
<footer class="main-footer">
<div class="pull-right hidden-xs" wicket:id="version">
<b><wicket:message key="PageTemplate.version"/></b> <wicket:message key="pageBase.midPointVersion"/>
</div>
<wicket:message key="PageTemplate.copy"/>
</footer>
</div>

<!-- Footer -->
<div class="mp-footer">
Thank you for using <a href="http://midpoint.evolveum.com">midPoint</a>, developed by
<a href="https://www.evolveum.com/">Evolveum</a> and partners, &copy;&nbsp;2010-2015&nbsp;
<!-- todo fix results -->
<div id="blackWindow"/>
<div id="xmlExport">
<span id="xmlExportContent"/>
</div>

<wicket:link>
<script src="../../../../../webjars/adminlte/2.3.0/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../../../../../webjars/adminlte/2.3.0/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
<script src='../../../../../webjars/adminlte/2.3.0/plugins/fastclick/fastclick.min.js'></script>
<script src="../../../../../webjars/adminlte/2.3.0/dist/js/app.min.js" type="text/javascript"></script>
</wicket:link>
<!-- OBSOLETE START -->
<script type="text/javascript" src="js/bootstrap-select/bootstrap-select.js"></script>
<script type="text/javascript" src="js/bootstrap-select/bootstrap-multiselect.js"></script>
<script type="text/javascript" src="js/ace/ace.js" charset="utf-8"></script>
<script type="text/javascript" src="wro/midpoint.js"></script>
<!-- OBSOLETE END-->
<script type="text/javascript" src="wro/midpoint-theme.js"></script>


<!-- begin changes -->
<script>
Expand Down

0 comments on commit c492d85

Please sign in to comment.