Commit 9224d32f authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Remove contextualhelp on add Google Apps block (bug: 1465107)"

parents 4316d964 c7a4755b
......@@ -15,6 +15,6 @@ defined('INTERNAL') || die();
$string['title'] = 'Google Apps';
$string['description'] = 'Embed Google calendar or docs';
$string['appscodeorurl'] = 'Embed code or URL';
$string['appscodeorurldesc'] = 'Paste the embed code or the URL of the page where Google Apps is publicly viewable.';
$string['appscodeorurldesc'] = 'Check the <a target="_blank" href="http://manual.mahara.org/en/15.10/blocks/external.html#google-apps">user manual</a> for instructions on how to embed Google content. <br> Paste the embed code or the URL of the page where Google Apps is publicly viewable.';
$string['height'] = 'Height';
$string['badurlerror'] = 'Unable to parse embedded code or URL: %s';
\ No newline at end of file
......@@ -77,8 +77,7 @@ class PluginBlocktypeGoogleApps extends SystemBlocktype {
'defaultvalue' => (!empty($configdata['appsid']) ? $configdata['appsid'] : null),
'rules' => array(
'required' => true
),
'help' => true,
)
),
'height' => array(
'type' => 'text',
......
<ul style="list-style-type: none;">
<li>
<ul class="list-unstyled list-inline google-apps">
<li class="google-app">
<a href="http://books.google.com/" target="_blank">
<img src="{$protocol}://www.google.com/intl/{$lang}/googlebooks/images/books_logo_sm.gif" alt="" height="20">
<img src="{$THEME->get_image_url('google-apps/google-books')}" alt="Google Books">
<span>Google Books</span>
</a>
</li>
<li>
<li class="google-app">
<a href="https://www.google.com/calendar" target="_blank">
<img src="{$protocol}://calendar.google.com/googlecalendar/images/calendar_logo_sm_{$lang}.gif" alt="" height="20">
<img src="{$THEME->get_image_url('google-apps/google-calendar')}" alt="Google Calendar">
<span>Google Calendar</span>
</a>
</li>
<li>
<li class="google-app">
<a href="https://docs.google.com/" target="_blank">
<img src="{$protocol}://docs.google.com/images/doclist/docs_logo_sm.gif" alt="" height="20">
<img src="{$THEME->get_image_url('google-apps/google-drive')}" alt="Google Docs">
<span>Google Drive</span>
</a>
</li>
<li>
<li class="google-app">
<a href="http://maps.google.com/" target="_blank">
<img src="{$protocol}://maps.google.com/intl/{$lang}/images/logos/maps_logo.gif" alt="" height="20">
<img src="{$THEME->get_image_url('google-apps/google-maps')}" alt="Google Maps">
<span>Google Maps</span>
</a>
</li>
</ul>
......@@ -302,3 +302,14 @@
@include sr-only;
}
}
//Google apps
.google-app {
font-style: normal;
img {
height: 20px;
}
a {
color: #245dc1;
}
}
\ No newline at end of file
......@@ -33,7 +33,7 @@
</thead>
<tbody>
{foreach from=$licenses key=i item=l}
<tr class="{cycle values='r0,r1'}">
<tr>
<td>{if $l->icon}<img src="{license_icon_url($l->icon)}" alt="{$l->displayname}">{/if}</td>
<td><a href="{$l->name}">{$l->displayname}</a></td>
<td>{$l->shortname}</td>
......
......@@ -2,7 +2,7 @@
{$form|safe}
{if $message}
<div class="no-result mtxl ptxl text-center">
<p class="ptxl lead">{$message|safe}</p>
<p class="ptxl lead">{$message|safe}</p>
</div>
{/if}
{if $results}
......
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