Commit eae67bf1 authored by Martyn Smith's avatar Martyn Smith Committed by Martyn Smith
Browse files
parents 4fac8dcc 0887d92a
......@@ -66,7 +66,7 @@ case "$1" in
echo '<VirtualHost *>' >> $APACHE_CONF_FILE
echo ${RET} | perl -ne '@s = split /\s*,\s*/; print " ServerName ", shift @s, "\n" if @s; print map { " ServerAlias $_\n" } @s;' >> $APACHE_CONF_FILE
db_get mahara/servername
echo " Redirect Permanent / http://${RET}" >> $APACHE_CONF_FILE
echo " Redirect Permanent / http://${RET}/" >> $APACHE_CONF_FILE
echo '</VirtualHost>' >> $APACHE_CONF_FILE
fi
......
......@@ -67,7 +67,7 @@ case "$1" in
echo '<VirtualHost *>' >> $APACHE_CONF_FILE
echo ${RET} | perl -ne '@s = split /\s*,\s*/; print " ServerName ", shift @s, "\n" if @s; print map { " ServerAlias $_\n" } @s;' >> $APACHE_CONF_FILE
db_get mahara/servername
echo " Redirect Permanent / http://${RET}" >> $APACHE_CONF_FILE
echo " Redirect Permanent / http://${RET}/" >> $APACHE_CONF_FILE
echo '</VirtualHost>' >> $APACHE_CONF_FILE
fi
......
......@@ -14,10 +14,12 @@
{include file="columnleftstart.tpl"}
<div id="myblogs">
<h2>{str section="artefact.blog" tag="myblogs"}</h2>
<div class="addicon">
<div class="addiconcontainer">
<span class="addicon">
<a href="{$WWWROOT}artefact/blog/new/">{str section="artefact.blog" tag="addblog"}</a>
</div>{contextualhelp plugintype='artefact' pluginname='blog' section='addblogbutton'}
</span>
{contextualhelp plugintype='artefact' pluginname='blog' section='addblogbutton'}
</div>
<table id="bloglist" class="tablerenderer">
<thead>
<tr>
......
......@@ -14,12 +14,18 @@
<h2>{str section="artefact.blog" tag="viewblog"} - {$blog->get('title')|escape}</h2>
<div id="myblogs">
<div class="blogsettings">
<div class="addicon">
<div class="blogsettingscontainer">
<div class="addiconcontainer">
<span class="addicon">
<a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
</span>
{contextualhelp plugintype='artefact' pluginname='blog' section='blogaddpostbutton'}
</div>
<span class="blogsettings">
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
</div>{contextualhelp plugintype='artefact' pluginname='blog' section='blogsettingsbutton'}{contextualhelp plugintype='artefact' pluginname='blog' section='blogaddpostbutton'}
</span>
{contextualhelp plugintype='artefact' pluginname='blog' section='blogsettingsbutton'}
</div>
<div><table id="postlist" class="tablerenderer">
......
......@@ -972,12 +972,12 @@ table#installer {
/* My Blogs styles */
#myblogs .blogsettings .addicon {
#myblogs .blogsettingscontainer .addiconcontainer {
margin: 0px 0 5px 0;
text-align: right;
float: right;
}
#myblogs .addicon {
#myblogs .addiconcontainer {
margin: 5px 0 5px 0;
text-align: right;
padding: 5px 0;
......@@ -987,7 +987,7 @@ table#installer {
text-align: right;
float: right;
}
#myblogs .blogsettings {
#myblogs .blogsettingscontainer {
margin: 10px 0 10px 0;
}
#myblogs .addicon a,
......@@ -995,11 +995,11 @@ table#installer {
#myblogs .addicon a:active,
#myblogs .addicon a:visited,
#myblogs .addicon a:hover,
#myblogs .blogsettings .addicon a,
#myblogs .blogsettings .addicon a:link,
#myblogs .blogsettings .addicon a:active,
#myblogs .blogsettings .addicon a:visited,
#myblogs .blogsettings .addicon a:hover {
#myblogs .blogsettingscontainer .addicon a,
#myblogs .blogsettingscontainer .addicon a:link,
#myblogs .blogsettingscontainer .addicon a:active,
#myblogs .blogsettingscontainer .addicon a:visited,
#myblogs .blogsettingscontainer .addicon a:hover {
background: url(../images/btn_add.gif) no-repeat;
width: 120px;
height: 24px;
......@@ -1117,11 +1117,11 @@ table#installer {
margin: 10px 0 10px 0;
text-align: right;
}
.maincontent #mygroups #addnewgroupdiv a,
.maincontent #mygroups #addnewgroupdiv a:link,
.maincontent #mygroups #addnewgroupdiv a:active,
.maincontent #mygroups #addnewgroupdiv a:visited,
.maincontent #mygroups #addnewgroupdiv a:hover {
.maincontent #mygroups #addnewgroup a,
.maincontent #mygroups #addnewgroup a:link,
.maincontent #mygroups #addnewgroup a:active,
.maincontent #mygroups #addnewgroup a:visited,
.maincontent #mygroups #addnewgroup a:hover {
background: url(../images/btn_add_long.gif) no-repeat;
width: 120px;
height: 24px;
......
......@@ -7,7 +7,12 @@
<div id="mygroups">
<div id="addnewgroupdiv"><a href="create.php" id="addnewgroup">{str tag="creategroup"}</a></div>{contextualhelp plugintype='core' pluginname='groups' section='addgroupbutton'}
<div id="addnewgroupdiv">
<span id="addnewgroup">
<a href="create.php" id="addnewgroup">{str tag="creategroup"}</a>
</span>
{contextualhelp plugintype='core' pluginname='groups' section='addgroupbutton'}
</div>
<table id="grouplist" class="tablerenderer">
<thead>
......
......@@ -8,7 +8,8 @@
<div id="views">
<div style="text-align:right;">
<input type="button" class="button" value="{str tag="createnewview"}" onclick="window.location='create1.php';" id="createnew">
</div>{contextualhelp plugintype='core' pluginname='views' section='createviewbutton'}
{contextualhelp plugintype='core' pluginname='views' section='createviewbutton'}
</div>
<table id="viewlist">
<tbody>
</tbody>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment