Author: sevein
Date: Sun Aug 12 15:24:16 2012
New Revision: 12078
Log:
Fix installer to be compatible with Trillium as default theme, add links to
administration manual and FAQ in the sidebar. Simplify layout, drop
header/footer, logo in the sidebar. Fixes issue 2394.
Deleted:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_footer.php
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_header.php
Modified:
trunk/apps/qubit/templates/layout_install.php
trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
trunk/plugins/qtTrilliumPlugin/css/less/main.css
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/config/view.yml
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_task.php
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/checkSystemSuccess.php
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureDatabaseSuccess.php
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureSiteSuccess.php
Modified: trunk/apps/qubit/templates/layout_install.php
==============================================================================
--- trunk/apps/qubit/templates/layout_install.php Sun Aug 12 00:02:46
2012 (r12077)
+++ trunk/apps/qubit/templates/layout_install.php Sun Aug 12 15:24:16
2012 (r12078)
@@ -4,28 +4,35 @@
<?php include_http_metas() ?>
<?php include_metas() ?>
<?php include_title() ?>
- <link rel="shortcut icon" href="/favicon.ico"/>
+ <link rel="shortcut icon" href="<?php echo public_path('favicon.ico') ?>"/>
<?php include_stylesheets() ?>
<?php include_javascripts() ?>
</head>
<body class="yui-skin-sam <?php echo $sf_context->getModuleName() ?> <?php
echo $sf_context->getActionName() ?>">
+
<div id="page-wrapper">
<div id="page">
+
<div id="main-wrapper">
<div class="clearfix" id="main">
- <div class="column" id="content">
- <div class="section">
- <?php echo $sf_content ?>
- </div> <!-- /.section -->
- </div> <!-- /.column#content -->
+
<div class="column sidebar" id="sidebar-first">
<div class="section">
<?php echo get_component_slot('install_sidebar') ?>
- </div> <!-- /.section -->
- </div> <!-- /.column.sidebar#sidebar-first -->
- </div> <!-- /#main -->
+ </div>
+ </div>
+
+ <div class="column" id="content">
+ <div class="section">
+ <?php echo $sf_content ?>
+ </div>
+ </div>
+
+ </div>
</div> <!-- /#main-wrapper -->
- </div> <!-- /#page -->
+
+ </div>
</div> <!-- /#page-wrapper -->
+
</body>
</html>
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_misc.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Sun Aug 12 00:02:46
2012 (r12077)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_misc.less Sun Aug 12 15:24:16
2012 (r12078)
@@ -284,7 +284,7 @@
textarea,
select,
input[type="text"],
- input[type="password"],
+ input[type="password"],
.yui-ac-input {
width: 100%;
@@ -297,7 +297,7 @@
select,
input[type="text"],
- input[type="password"],
+ input[type="password"],
.yui-ac-input {
height: 26px;
@@ -1604,3 +1604,107 @@
}
}
+
+
+.sfInstallPlugin {
+
+ #page-wrapper
+ {
+ margin-top: 20px;
+ }
+
+ #logo
+ {
+ margin-bottom: 20px;
+ }
+
+ .task-list
+ {
+ font-size: 1.1em;
+ margin-bottom: 30px;
+ }
+
+ .task-list li
+ {
+ line-height: 24px;
+ }
+
+ .task-list .active
+ {
+ font-weight: bold;
+ color: Black;
+ }
+
+ .task-list .done
+ {
+ color: green;
+ }
+
+ #content
+ {
+ margin-top: 20px;
+ }
+
+ .progress {
+
+ font-weight: bold;
+
+ .bar {
+
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ background: #ccc;
+ border: 1px solid #666;
+ margin: 0 0.2em;
+
+ }
+
+ .filled {
+
+ background: #0072b9;
+ height: 1.5em;
+ width: 5px;
+
+ }
+
+ .percentage {
+
+ float: right; /* LTR */
+
+ }
+
+ .progress-disabled {
+
+ float: left; /* LTR */
+
+ }
+
+ }
+
+ .ajax-progress {
+
+ float: left; /* LTR */
+
+ .throbber {
+ width: 15px;
+ height: 15px;
+ margin: 2px;
+ float: left; /* LTR */
+ }
+
+ }
+
+ tr .ajax-progress .throbber {
+
+ margin: 0 2px;
+
+ }
+
+ .ajax-progress-bar {
+
+ width: 16em;
+
+ }
+
+}
Modified: trunk/plugins/qtTrilliumPlugin/css/less/main.css
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/main.css Sun Aug 12 00:02:46
2012 (r12077)
+++ trunk/plugins/qtTrilliumPlugin/css/less/main.css Sun Aug 12 15:24:16
2012 (r12078)
@@ -283,7 +283,7 @@
h1{color:#bfbfbf;font-weight:normal;}h1.small{font-size:18px;line-height:18px;margin-bottom:20px;}
h1.label{color:#404040;font-weight:bold;}
h1+h1.label{margin-top:-18px;}
-.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:10px;border-top:1px
solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px
3px;border-radius:0 0 3px 3px;padding-left:20px;}.actions
input[type=submit],.actions
button[type=submit]{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear,
0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff),
to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255,
0.75);color:#333;font-size:13px;line-height:18px;border:1px solid
#ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-borde
r-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255,
255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,
255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255,
255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear
all;-moz-transition:0.1s linear all;transition:0.1s linear
all;cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear,
0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff),
to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75
);color:#333;font-size:13px;line-height:normal;border:1px solid
#ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset
0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0,
0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0,
0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0,
0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear
all;transition:0.1s linear
all;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#049cdb),
to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb,
#0064cd);background-image:-ms-linear-gradient(top, #049cdb,
#0064cd);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #049cdb), color-stop(100%,
#0064cd));background-image:-webkit-linear-gradient(top, #049cdb,
#0064cd);background-image:-o-linear-gradient
(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb,
#0064cd);color:White;text-shadow:0 -1px 0 rgba(0, 0, 0,
0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1)
rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.actions
input[type=submit].danger,.actions button[type=submit].danger,.actions
input[type=submit].danger:hover,.actions
button[type=submit].danger:hover,.actions input[type=submit].error,.actions
button[type=submit].error,.actions input[type=submit].error:hover,.actions
button[type=submit].error:hover,.actions input[type=submit].success,.actions
button[type=submit].success,.actions input[type=submit].success:hover,.actions
button[type=submit].success:hover,.actions input[type=submit].info,.actions
button[type=submit].info,.actions input[type=submit].info:hover,.actions
button[type=submit].info:hover{color:#ffffff;}
+.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:10px;border-top:1px
solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px
3px;border-radius:0 0 3px 3px;padding-left:20px;}.actions
input[type=submit],.actions button[type=submit]{padding:4px
14px;line-height:18px;cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear,
0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff),
to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255,
0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border
-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset
0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0,
0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0,
0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0,
0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear
all;transition:0.1s linear
all;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#049cdb),
to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb,
#0064cd);background-image:-ms-linear-gradient(top, #049cdb,
#0064cd);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #049cdb), color-stop(100%,
#0064cd));background-image:-webkit-linear-gradient(top, #049cdb,
#0064cd);background-image:-o-linear-gradient(top, #049cdb,
#0064cd);background-image:linear-gradient(top, #049cdb, #006
4cd);color:White;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd
#0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0,
0, 0.25);}.actions input[type=submit].danger,.actions
button[type=submit].danger,.actions input[type=submit].danger:hover,.actions
button[type=submit].danger:hover,.actions input[type=submit].error,.actions
button[type=submit].error,.actions input[type=submit].error:hover,.actions
button[type=submit].error:hover,.actions input[type=submit].success,.actions
button[type=submit].success,.actions input[type=submit].success:hover,.actions
button[type=submit].success:hover,.actions input[type=submit].info,.actions
button[type=submit].info,.actions input[type=submit].info:hover,.actions
button[type=submit].info:hover{color:#ffffff;}
.actions input[type=submit].danger,.actions
button[type=submit].danger,.actions input[type=submit].error,.actions
button[type=submit].error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#ee5f5b),
to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-ms-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #ee5f5b), color-stop(100%,
#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-o-linear-gradient(top, #ee5f5b,
#c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);text-shadow:0
-1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35
#882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
.actions input[type=submit].success,.actions
button[type=submit].success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#62c462),
to(#57a957));background-image:-moz-linear-gradient(top, #62c462,
#57a957);background-image:-ms-linear-gradient(top, #62c462,
#57a957);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #62c462), color-stop(100%,
#57a957));background-image:-webkit-linear-gradient(top, #62c462,
#57a957);background-image:-o-linear-gradient(top, #62c462,
#57a957);background-image:linear-gradient(top, #62c462, #57a957);text-shadow:0
-1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957
#3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
.actions input[type=submit].info,.actions
button[type=submit].info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#5bc0de),
to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de,
#339bb9);background-image:-ms-linear-gradient(top, #5bc0de,
#339bb9);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #5bc0de), color-stop(100%,
#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de,
#339bb9);background-image:-o-linear-gradient(top, #5bc0de,
#339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);text-shadow:0
-1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9
#22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
@@ -304,7 +304,7 @@
.actions input[type=submit]:hover,.actions
button[type=submit]:hover{color:#fff;}
.actions
.delete{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#ee5f5b),
to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-ms-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #ee5f5b), color-stop(100%,
#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-o-linear-gradient(top, #ee5f5b,
#c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);text-shadow:0
0 0;color:White;}.actions .delete:hover{color:#fff;}
.actions h2{border:0 !important;}
-.actions
a{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear,
0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff),
to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255,
0.75);color:#333;font-size:13px;line-height:18px;border:1px solid
#ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset
0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0,
0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0,
0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1p
x 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear
all;-moz-transition:0.1s linear all;transition:0.1s linear
all;cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear,
0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff),
to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255,
0.75);color:#333;font-size:13px;line-height:normal;border:1px solid
#ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset
0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-
shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0,
0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0,
0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear
all;transition:0.1s linear all;padding-left:7px;padding-right:7px;}.actions
a.danger,.actions a.danger:hover,.actions a.error,.actions
a.error:hover,.actions a.success,.actions a.success:hover,.actions
a.info,.actions a.info:hover{color:#ffffff;}
+.actions a{padding:4px
14px;line-height:18px;cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear,
0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff),
to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255,
0.75);color:#333;font-size:13px;line-height:normal;border:1px solid
#ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset
0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0,
0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0,
0, 0, 0.05)
;box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0,
0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear
all;transition:0.1s linear all;padding-left:7px;padding-right:7px;}.actions
a.danger,.actions a.danger:hover,.actions a.error,.actions
a.error:hover,.actions a.success,.actions a.success:hover,.actions
a.info,.actions a.info:hover{color:#ffffff;}
.actions a.danger,.actions
a.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#ee5f5b),
to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-ms-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #ee5f5b), color-stop(100%,
#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-o-linear-gradient(top, #ee5f5b,
#c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);text-shadow:0
-1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35
#882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
.actions
a.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#62c462),
to(#57a957));background-image:-moz-linear-gradient(top, #62c462,
#57a957);background-image:-ms-linear-gradient(top, #62c462,
#57a957);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #62c462), color-stop(100%,
#57a957));background-image:-webkit-linear-gradient(top, #62c462,
#57a957);background-image:-o-linear-gradient(top, #62c462,
#57a957);background-image:linear-gradient(top, #62c462, #57a957);text-shadow:0
-1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957
#3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
.actions
a.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#5bc0de),
to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de,
#339bb9);background-image:-ms-linear-gradient(top, #5bc0de,
#339bb9);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #5bc0de), color-stop(100%,
#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de,
#339bb9);background-image:-o-linear-gradient(top, #5bc0de,
#339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);text-shadow:0
-1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9
#22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
@@ -427,7 +427,7 @@
.search-results .field>div{margin-left:10px;}
.imageflow .scrollbar{margin-top:4px;}.imageflow .scrollbar
.slider{background-image:url(../../../../vendor/imageflow/slider_dark.png);}
body.settings #content table tr td:first-child{width:180px;}
-body.settings #content table input[type=submit],body.settings #content table
button[type=submit]{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear,
0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff),
to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255,
0.75);color:#333;font-size:13px;line-height:18px;border:1px solid
#ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset
0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0,
0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2
),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255,
0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear
all;-moz-transition:0.1s linear all;transition:0.1s linear
all;cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear,
0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff),
to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255,
0.75);color:#333;font-size:13px;line-height:normal;border:1px solid
#ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box
-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0,
0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0,
0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0,
0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear
all;transition:0.1s linear
all;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#049cdb),
to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb,
#0064cd);background-image:-ms-linear-gradient(top, #049cdb,
#0064cd);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #049cdb), color-stop(100%,
#0064cd));background-image:-webkit-linear-gradient(top, #049cdb,
#0064cd);background-image:-o-linear-gradient(top, #049cdb,
#0064cd);background-image:linear-gradient(top, #049cdb,
#0064cd);color:White;text-shadow:0 -1px 0 rgba(0, 0, 0,
0.25);border-color:#0064cd #0064cd #003f81;bo
rder-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0,
0.25);}body.settings #content table input[type=submit].danger,body.settings
#content table button[type=submit].danger,body.settings #content table
input[type=submit].danger:hover,body.settings #content table
button[type=submit].danger:hover,body.settings #content table
input[type=submit].error,body.settings #content table
button[type=submit].error,body.settings #content table
input[type=submit].error:hover,body.settings #content table
button[type=submit].error:hover,body.settings #content table
input[type=submit].success,body.settings #content table
button[type=submit].success,body.settings #content table
input[type=submit].success:hover,body.settings #content table
button[type=submit].success:hover,body.settings #content table
input[type=submit].info,body.settings #content table
button[type=submit].info,body.settings #content table
input[type=submit].info:hover,body.settings #content table
button[type=submit].in
fo:hover{color:#ffffff;}
+body.settings #content table input[type=submit],body.settings #content table
button[type=submit]{padding:4px
14px;line-height:18px;cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear,
0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff),
to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25,
#e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255,
0.75);color:#333;font-size:13px;line-height:normal;border:1px solid
#ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset
0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05
);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0,
0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0,
0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear
all;transition:0.1s linear
all;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#049cdb),
to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb,
#0064cd);background-image:-ms-linear-gradient(top, #049cdb,
#0064cd);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #049cdb), color-stop(100%,
#0064cd));background-image:-webkit-linear-gradient(top, #049cdb,
#0064cd);background-image:-o-linear-gradient(top, #049cdb,
#0064cd);background-image:linear-gradient(top, #049cdb,
#0064cd);color:White;text-shadow:0 -1px 0 rgba(0, 0, 0,
0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1)
rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}body.
settings #content table input[type=submit].danger,body.settings #content table
button[type=submit].danger,body.settings #content table
input[type=submit].danger:hover,body.settings #content table
button[type=submit].danger:hover,body.settings #content table
input[type=submit].error,body.settings #content table
button[type=submit].error,body.settings #content table
input[type=submit].error:hover,body.settings #content table
button[type=submit].error:hover,body.settings #content table
input[type=submit].success,body.settings #content table
button[type=submit].success,body.settings #content table
input[type=submit].success:hover,body.settings #content table
button[type=submit].success:hover,body.settings #content table
input[type=submit].info,body.settings #content table
button[type=submit].info,body.settings #content table
input[type=submit].info:hover,body.settings #content table
button[type=submit].info:hover{color:#ffffff;}
body.settings #content table input[type=submit].danger,body.settings #content
table button[type=submit].danger,body.settings #content table
input[type=submit].error,body.settings #content table
button[type=submit].error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#ee5f5b),
to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-ms-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #ee5f5b), color-stop(100%,
#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b,
#c43c35);background-image:-o-linear-gradient(top, #ee5f5b,
#c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);text-shadow:0
-1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35
#882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
body.settings #content table input[type=submit].success,body.settings #content
table
button[type=submit].success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#62c462),
to(#57a957));background-image:-moz-linear-gradient(top, #62c462,
#57a957);background-image:-ms-linear-gradient(top, #62c462,
#57a957);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #62c462), color-stop(100%,
#57a957));background-image:-webkit-linear-gradient(top, #62c462,
#57a957);background-image:-o-linear-gradient(top, #62c462,
#57a957);background-image:linear-gradient(top, #62c462, #57a957);text-shadow:0
-1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957
#3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
body.settings #content table input[type=submit].info,body.settings #content
table
button[type=submit].info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear,
left top, left bottom, from(#5bc0de),
to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de,
#339bb9);background-image:-ms-linear-gradient(top, #5bc0de,
#339bb9);background-image:-webkit-gradient(linear, left top, left bottom,
color-stop(0%, #5bc0de), color-stop(100%,
#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de,
#339bb9);background-image:-o-linear-gradient(top, #5bc0de,
#339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);text-shadow:0
-1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9
#22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
@@ -449,6 +449,20 @@
body.settings #content table tr:last-child td{background-color:#f5f5f5;}
body.settings #content table label{float:none;width:auto;}
body.settings #content table ul{margin:0;}body.settings #content table ul
li{margin-bottom:3px;}
+.sfInstallPlugin #page-wrapper{margin-top:20px;}
+.sfInstallPlugin #logo{margin-bottom:20px;}
+.sfInstallPlugin .task-list{font-size:1.1em;margin-bottom:30px;}
+.sfInstallPlugin .task-list li{line-height:24px;}
+.sfInstallPlugin .task-list .active{font-weight:bold;color:Black;}
+.sfInstallPlugin .task-list .done{color:green;}
+.sfInstallPlugin #content{margin-top:20px;}
+.sfInstallPlugin .progress{font-weight:bold;}.sfInstallPlugin .progress
.bar{border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;background:#ccc;border:1px
solid #666;margin:0 0.2em;}
+.sfInstallPlugin .progress .filled{background:#0072b9;height:1.5em;width:5px;}
+.sfInstallPlugin .progress .percentage{float:right;}
+.sfInstallPlugin .progress .progress-disabled{float:left;}
+.sfInstallPlugin .ajax-progress{float:left;}.sfInstallPlugin .ajax-progress
.throbber{width:15px;height:15px;margin:2px;float:left;}
+.sfInstallPlugin tr .ajax-progress .throbber{margin:0 2px;}
+.sfInstallPlugin .ajax-progress-bar{width:16em;}
#sfWebDebug{position:fixed;z-index:50000;}
#header{z-index:11000;}
.nowrap{white-space:nowrap;}
Modified: trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/config/view.yml
==============================================================================
--- trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/config/view.yml
Sun Aug 12 00:02:46 2012 (r12077)
+++ trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/config/view.yml
Sun Aug 12 15:24:16 2012 (r12078)
@@ -1,3 +1,8 @@
+checkSystemSuccess:
+ javascripts:
+ /plugins/sfDrupalPlugin/vendor/drupal/misc/jquery.once.js:
+ /plugins/sfDrupalPlugin/vendor/drupal/misc/progress:
+
configureDatabaseSuccess:
javascripts:
/plugins/sfDrupalPlugin/vendor/drupal/misc/jquery.once.js:
@@ -14,4 +19,9 @@
components:
install_sidebar: [sfInstallPlugin, task]
stylesheets:
- /css/classic:
+ -*:
+ form:
+ graphic:
+ main:
+ /plugins/qtTrilliumPlugin/css/less/main.css:
+ /plugins/qtTrilliumPlugin/css/ie: { condition: IE, position: last }
Modified:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_task.php
==============================================================================
--- trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_task.php
Sun Aug 12 00:02:46 2012 (r12077)
+++ trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_task.php
Sun Aug 12 15:24:16 2012 (r12078)
@@ -1,6 +1,29 @@
-<ol class="task-list">
- <li<?php switch ($sf_request->action): case 'checkSystem': ?>
class="active"<?php break; case 'configureDatabase': case 'loadData': case
'configureSite': case 'finishInstall': ?> class="done"<?php endswitch; ?>>Check
system</li>
- <li<?php switch ($sf_request->action): case 'configureDatabase': ?>
class="active"<?php break; case 'loadData': case 'configureSite': case
'finishInstall': ?> class="done"<?php endswitch; ?>>Configure database</li>
- <li<?php switch ($sf_request->action): case 'loadData': ?>
class="active"<?php break; case 'configureSite': case 'finishInstall': ?>
class="done"<?php endswitch; ?>>Load data</li>
- <li<?php switch ($sf_request->action): case 'configureSite': ?>
class="active"<?php break; case 'finishInstall': ?> class="done"<?php
endswitch; ?>>Configure site</li>
-</ol>
+<?php echo image_tag('logo', array('id' => 'logo', 'alt' => 'Home')) ?>
+
+<h1>Installation</h1>
+
+<div class="section">
+
+ <div class="content">
+ <ol class="clearfix task-list">
+ <li<?php switch ($sf_request->action): case 'checkSystem': ?>
class="active"<?php break; case 'configureDatabase': case 'loadData': case
'configureSite': case 'finishInstall': ?> class="done"<?php endswitch; ?>>Check
system</li>
+ <li<?php switch ($sf_request->action): case 'configureDatabase': ?>
class="active"<?php break; case 'loadData': case 'configureSite': case
'finishInstall': ?> class="done"<?php endswitch; ?>>Configure database</li>
+ <li<?php switch ($sf_request->action): case 'loadData': ?>
class="active"<?php break; case 'configureSite': case 'finishInstall': ?>
class="done"<?php endswitch; ?>>Load data</li>
+ <li<?php switch ($sf_request->action): case 'configureSite': ?>
class="active"<?php break; case 'finishInstall': ?> class="done"<?php
endswitch; ?>>Configure site</li>
+ </ol>
+ </div>
+
+</div>
+
+<div class="section">
+
+ <h2>Help</h2>
+
+ <div class="content">
+ <ul class="clearfix links">
+ <li><a
href="http://www.qubit-toolkit.org/wiki/Administrator_manual";>Administrator
manual</a></li>
+ <li><a href="http://www.qubit-toolkit.org/wiki/FAQ";>Frequently asked
questions</a></li>
+ </ul>
+ </div>
+
+</div>
Modified:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/checkSystemSuccess.php
==============================================================================
---
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/checkSystemSuccess.php
Sun Aug 12 00:02:46 2012 (r12077)
+++
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/checkSystemSuccess.php
Sun Aug 12 15:24:16 2012 (r12078)
@@ -3,7 +3,6 @@
<h2>System checks</h2>
<div id="progress"></div>
-<?php use_javascript('/plugins/sfDrupalPlugin/vendor/drupal/misc/progress') ?>
<?php $checkHtaccessUrl = json_encode(url_for(array('module' =>
'sfInstallPlugin', 'action' => 'checkHtaccess'))) ?>
<?php echo javascript_tag(<<<EOF
var progress = new Drupal.progressBar('checkSystem');
@@ -87,14 +86,17 @@
</div>
<?php endif; ?>
-<?php if ($error): ?>
- <ul>
- <li><?php echo link_to('Try again', $sf_request->getUri()) ?></li>
- <li><?php echo link_to('Ignore errors and continue', array('module' =>
'sfInstallPlugin', 'action' => 'configureDatabase')) ?></li>
- </ul>
-<?php else: ?>
- <!-- If JavaScript is enabled, automatically redirect to the next task.
Include a link in case it is not. -->
- <ul>
- <li><?php echo link_to('Continue', array('module' => 'sfInstallPlugin',
'action' => 'configureDatabase')) ?></li>
- </ul>
-<?php endif; ?>
+<div class="actions section">
+ <h2 class="element-invisible">Actions</h2>
+ <div class="content">
+ <ul class="clearfix links">
+ <?php if ($error): ?>
+ <li><?php echo link_to('Try again', $sf_request->getUri()) ?></li>
+ <li><?php echo link_to('Ignore errors and continue', array('module' =>
'sfInstallPlugin', 'action' => 'configureDatabase')) ?></li>
+ <?php else: ?>
+ <!-- If JavaScript is enabled, automatically redirect to the next
task. Include a link in case it is not. -->
+ <li><?php echo link_to('Continue', array('module' =>
'sfInstallPlugin', 'action' => 'configureDatabase')) ?></li>
+ <?php endif; ?>
+ </ul>
+ </div>
+</div>
Modified:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureDatabaseSuccess.php
==============================================================================
---
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureDatabaseSuccess.php
Sun Aug 12 00:02:46 2012 (r12077)
+++
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureDatabaseSuccess.php
Sun Aug 12 15:24:16 2012 (r12078)
@@ -50,6 +50,11 @@
</fieldset>
- <input class="form-submit" type="submit" value="Save and continue"/>
+ <div class="actions section">
+ <h2 class="element-invisible">Actions</h2>
+ <div class="content">
+ <input class="form-submit" type="submit" value="Save and continue"/>
+ </div>
+ </div>
</form>
Modified:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureSiteSuccess.php
==============================================================================
---
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureSiteSuccess.php
Sun Aug 12 00:02:46 2012 (r12077)
+++
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/configureSiteSuccess.php
Sun Aug 12 15:24:16 2012 (r12078)
@@ -62,6 +62,11 @@
</fieldset>
- <input class="form-submit" type="submit" value="<?php echo 'Save and
continue' ?>"/>
+ <div class="actions section">
+ <h2 class="element-invisible">Actions</h2>
+ <div class="content">
+ <input class="form-submit" type="submit" value="Save and continue"/>
+ </div>
+ </div>
</form>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
