Commit e7f92d66 authored by Evonne Cheung's avatar Evonne Cheung Committed by Hugh Davenport
Browse files

artefact/file: Theme update



Responsive theme

Bug #1041645

Change-Id: I27a2cc89329fb1c2cd78a3dd53de47fa0d9adecd
Signed-off-by: default avatarHugh Davenport <hugh@catalyst.net.nz>
parent 22ae93e1
......@@ -96,10 +96,10 @@ var table = new TableRenderer(
[
function(rowdata) {
if (rowdata.id) {
return TD({'class': 'center', 'width': '120px'}, null, IMG({'src': '{$wwwroot}thumb.php?type=profileiconbyid&maxsize=100&id=' + rowdata.id, 'alt': rowdata.note}));
return TD({'class': 'profileiconcell'}, null, IMG({'src': '{$wwwroot}thumb.php?type=profileiconbyid&maxsize=100&id=' + rowdata.id, 'alt': rowdata.note}));
}
else {
return TD({'class': 'center', 'width': '120px'}, null, IMG({'src': '{$ravatar}', 'alt': rowdata.note}));
return TD({'class': 'profileiconcell'}, null, IMG({'src': '{$ravatar}', 'alt': rowdata.note}));
}
},
function(rowdata) {
......@@ -114,14 +114,14 @@ var table = new TableRenderer(
if (rowdata['isdefault'] == 't' || rowdata['isdefault'] == 1) {
options.checked = 'checked';
}
return TD({'class': 'left', 'width': '110px'}, INPUT(options));
return TD({'class': 'defaultcell'}, INPUT(options));
},
function(rowdata) {
if (rowdata.id) {
return TD({'class': 'left', 'width': '110px'}, INPUT({'type': 'checkbox', 'class': 'checkbox', 'name': 'icons[' + rowdata.id + ']', 'value': rowdata.attachcount + ',' + rowdata.viewcount}));
return TD({'class': 'deletecell'}, INPUT({'type': 'checkbox', 'name': 'icons[' + rowdata.id + ']', 'value': rowdata.attachcount + ',' + rowdata.viewcount}));
}
else {
return TD({'class': 'left', 'width': '110px'}, INPUT({'disabled': 'disabled', 'type': 'checkbox', 'class': 'checkbox', 'name': 'icons[' + rowdata.id + ']', 'value': rowdata.attachcount + ',' + rowdata.viewcount}));
return TD({'class': 'deletecell'}, INPUT({'disabled': 'disabled', 'type': 'checkbox', 'name': 'icons[' + rowdata.id + ']', 'value': rowdata.attachcount + ',' + rowdata.viewcount}));
}
}
]
......
/**
* CSS rules for the file artefact plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* File upload box */
#upload,
.fileupload {
background-color: #ebf0f4;
border: 0;
}
/* File list */
.filelist td.right input.btn-del {
color: #BC0909;
}
/* parent folder row */
tr.parentfolder td {
background-color: #f0f4f7 !important;
}
/* new row */
.filelist tr.highlight-file td {
background-color: #fffcd8;
}
/* folder row */
tr.folder td {
background-color: #f0f4f7 !important;
}
/* folder row being moved */
tr.folderhover td {
background-color: #daf0ff !important;
}
#createfolder {
background-color: #ebf0f4;
border: 0;
}
/**
* CSS rules for the file artefact plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* File upload box */
.fileupload {
background: #1C3740;
border: 0;
}
/* File list */
.filelist th {
border-bottom: 1px dotted #BEE3F1;
}
/* folder row */
tr.folder td {
background-color:#10171A;
}
#editpost_filebrowser_upload_browse, #editpost_filebrowser_open_upload_browse_container {
border-color: #10171A;
}
\ No newline at end of file
......@@ -69,7 +69,7 @@
<input type="submit" class="cancel" name="{$prefix}_canceledit" id="{$prefix}_edit_cancel" value="{str tag=cancel}" />
</td>
</tr>
<tr><td colspan=2 id="{$prefix}_edit_messages"></td></tr>
<tr><td colspan="2" id="{$prefix}_edit_messages"></td></tr>
</tbody>
</table>
</td>
......
......@@ -35,53 +35,44 @@
</div>
{/if}
<table id="{$prefix}_upload_container" class="fileupload{if ($tabs && !$tabs.upload) || $uploaddisabled} hidden{/if}">
<tbody>
<div id="{$prefix}_upload_container" class="fileupload{if ($tabs && !$tabs.upload) || $uploaddisabled} hidden{/if}">
{if $config.upload}
{* config.uploadagreement: disable the file chooser unless the agreement is checked *}
{* config.simpleupload: the form only contains a file chooser *}
{* config.submitbutton: add submit button even if js is enabled & don't start uploading as soon as a file is chosen *}
<input type="hidden" name="{$prefix}_uploadnumber" id="{$prefix}_uploadnumber" value="1" />
<input type="hidden" name="MAX_FILE_SIZE" value="{$phpmaxfilesize}" />
<tr><td colspan=2 id="{$prefix}_upload_messages"></td></tr>
<div id="{$prefix}_upload_messages"></div>
{if $config.uploadagreement}
<tr id="{$prefix}_agreement" class="uploadform">
<th><label>{str tag='uploadfile' section='artefact.file'}</label></th>
<td>
<div id="{$prefix}_agreement" class="uploadform">
<label>{str tag='uploadfile' section='artefact.file'}</label>
<input type="checkbox" name="{$prefix}_notice" id="{$prefix}_notice" />
{$agreementtext|clean_html|safe}
</td>
</tr>
</div>
{/if}
<tr class="uploadform">
<th><label>{if $config.simpleupload}{str tag='uploadfile' section='artefact.file'}{else}{str tag='File' section='artefact.file'}{/if}</label></th>
<td>
<span id="{$prefix}_userfile_container"><input type="file" class="file" id="{$prefix}_userfile" name="userfile[]" multiple size="40" /></span>
<span id="{$prefix}_userfile_maxuploadsize">({str tag=maxuploadsize section=artefact.file} {$maxuploadsize})</span>
<div class="uploadform">
<label>{if $config.simpleupload}{str tag='uploadfile' section='artefact.file'}{else}{str tag='File' section='artefact.file'}{/if}</label>
<span id="{$prefix}_userfile_container"><input type="file" class="file" id="{$prefix}_userfile" name="userfile[]" multiple size="20" /></span>
<span id="{$prefix}_userfile_maxuploadsize" class="s">({str tag=maxuploadsize section=artefact.file} {$maxuploadsize})</span>
{if $config.uploadagreement}<script>setNodeAttribute('{$prefix}_userfile', 'disabled', true);</script>{/if}
</td>
</tr>
</div>
{if $config.resizeonuploaduseroption}
<tr id="{$prefix}_resizeonuploaduseroption" class="description">
<th></th>
<td>{str tag='resizeonuploadenablefilebrowser1' section='artefact.file' arg1=$resizeonuploadmaxwidth arg2=$resizeonuploadmaxheight}
<div id="{$prefix}_resizeonuploaduseroption" class="description">
{str tag='resizeonuploadenablefilebrowser1' section='artefact.file' arg1=$resizeonuploadmaxwidth arg2=$resizeonuploadmaxheight}
<input type="checkbox" name="{$prefix}_resizeonuploaduserenable" id="{$prefix}_resizeonuploaduserenable" {if $resizeonuploadenable && $config.resizeonuploaduserdefault}checked{/if}/>
{contextualhelp plugintype='artefact' pluginname='file' form='files_filebrowser' element='resizeonuploaduseroption'}
</td>
</tr>
</div>
{/if}
<tr class="uploadform">
<th></th>
<td id="{$prefix}_uploadsubmit_container">{* filebrowser.js may add a submit button in here even if config.submitbutton is off *}
<div class="uploadform">
<div id="{$prefix}_uploadsubmit_container">{* filebrowser.js may add a submit button in here even if config.submitbutton is off *}
{if $config.submitbutton}
<input type="submit" class="submit nojs-hidden-block" name="{$prefix}_uploadsubmit" id="{$prefix}_uploadsubmit" value="{str tag=upload section=artefact.file}" />
{/if}
<noscript><input type="submit" class="submit" name="{$prefix}_upload" id="{$prefix}_upload" value="{str tag=upload section=artefact.file}" /></noscript>
</td>
</tr>
</div>
</div>
{/if}
</tbody>
</table>
</div>
{if $config.upload}
<div id="{$prefix}_upload_disabled" class="uploaddisabled{if !$uploaddisabled} hidden{/if}">{str tag="cannoteditfolder" section=artefact.file}</div>
{/if}
......
{if !$filelist}
<p>{str tag=nofilesfound section=artefact.file}</p>
{else}
<table id="{$prefix}_filelist" class="tablerenderer filelist">
<table id="{$prefix}_filelist" class="tablerenderer filelist fullwidth">
<thead>
<tr>
<th></th>
<th>{str tag=Name section=artefact.file}</th>
<th>{str tag=Description section=artefact.file}</th>
<th class="filethumb"></th>
<th class="filename">{str tag=Name section=artefact.file}</th>
<th class="filedescription">{str tag=Description section=artefact.file}</th>
{if !$showtags && !$editmeta}
<th>{str tag=Size section=artefact.file}</th>
<th>{str tag=Date section=artefact.file}</th>
<th class="filesize">{str tag=Size section=artefact.file}</th>
<th class="filedate">{str tag=Date section=artefact.file}</th>
{/if}
{if $showtags}
<th><div>{str tag=tags}</div></th>
<th class="filetags"><div>{str tag=tags}</div></th>
{/if}
{if $editmeta}
<th></th>
<th class="right"></th>
{/if}
<th></th>
<th class="right btns3"></th>
</tr>
</thead>
<tbody>
......
<p id="{$prefix}_empty_selectlist"{if $selectedlist} class="hidden"{/if}>{if !$selectfolders}{str tag=nofilesfound section=artefact.file}{/if}</p>
<table id="{$prefix}_selectlist" class="fullwidth {if !$selectedlist} hidden{/if}">
<table id="{$prefix}_selectlist" class="fullwidth{if !$selectedlist} hidden{/if}">
<thead>
<tr>
<th></th>
<th>{str tag=Name section=artefact.file}</th>
<th>{str tag=Description section=artefact.file}</th>
<th class="filedescription">{str tag=Description section=artefact.file}</th>
<th></th>
</tr>
</thead>
......@@ -18,8 +18,8 @@
<td class="valign">
{if $selectfolders}{$displaytitle}{else}<a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" target="_blank" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}">{$displaytitle}</a>{/if}
</td>
<td class="valign">{$file->description}</td>
<td>
<td class="filedescription valign">{$file->description}</td>
<td class="right">
<input type="submit" class="button submit s unselect" name="{$prefix}_unselect[{$file->id}]" value="{str tag=remove}" />
<input type="hidden" name="{$prefix}_selected[{$file->id}]" value="{$file->id}">
</td>
......
{include file="header.tpl"}
{$settingsformtag|safe}
<table id="profileicons" class="hidden tablerenderer">
<table id="profileicons" class="hidden tablerenderer fullwidth">
<thead>
<tr>
<th>{str tag="image"}</th>
<th class="profileiconcell">{str tag="image"}</th>
<th>{str tag="imagetitle" section=artefact.file}</th>
<th>{str tag="Default" section=artefact.file}</th>
<th>{str tag="delete"}</th>
<th class="defaultcell">{str tag="Default" section=artefact.file}</th>
<th class="deletecell">{str tag="delete"}</th>
</tr>
</thead>
<tbody>
......
File mode changed from 100755 to 100644
/**
* CSS rules for the file artefact plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* Copyright (C) 2006-2012 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
#profileicons {
width: 100%;
}
* html #profileicons {
width: 97%;
}
#profileicons tfoot td.right input.submit {
font-weight: bold;
}
#profileicons tfoot td.right input#settings_delete {
font-weight: normal;
}
/* File upload box */
.fileupload {
background: #eee;
border: 1px solid #d1d1d1;
margin-bottom: 10px;
width: 100%;
padding: 5px;
}
.uploaddisabled {
background: #eee;
border: 1px solid #d1d1d1;
margin-bottom: 10px;
padding: .25em;
}
* html .fileupload {
width: 98%;
padding: 5px;
}
.fileupload th {
text-align: left;
padding-left: 10px !important;
}
.fileupload th label,
.uploadform th label {
white-space: nowrap !important;
font-weight: bold !important;
#upload label, .fileupload label, .pieform .uploadform label {
white-space: nowrap;
font-weight: bold;
}
.uploadform td {
font-size: .9167em;
line-height: 1.3333em;
}
.createfolder-message div {
margin-bottom: 3px;
margin-bottom: 3px;
}
#createfolder {
background-color: #EEE;
border: 1px solid #D1D1D1;
padding: 3px 5px;
padding: 5px;
margin: 10px 0 5px 0;
}
#upload {
background-color: #EEE;
border: 1px solid #D1D1D1;
}
#upload tr th {
padding: 5px 5px 3px 10px;
}
#upload #upload_file_container th {
padding-top: 10px;
}
#upload #upload_file_container td {
padding-top: 10px;
}
#upload #upload_submit_container td {
padding-bottom: 10px;
}
/* folder nav */
.foldernav {
font-weight: bold;
padding: 1px 0 0 20px;
font-size: 1.3333em;
background: url(../images/foldernav_small.png) no-repeat left top;
}
form#files .foldernav {
padding: 5px 0 3px 30px;
font-size: 1.3333em;
background: url(../images/foldernav.png) no-repeat left top;
}
td.filethumb {
width: 25px;
vertical-align: middle;
}
td.filename {
padding: 7px 5px 3px 5px !important;
}
td.filedescription {
padding: 7px 5px 3px 5px!important;
font-size: .9167em;
}
td.filesize {
padding: 7px 5px 3px 5px!important;
font-size: .9167em;
}
td.filedate {
padding: 7px 5px 3px 5px!important;
font-size: .9167em;
color: #888888;
}
td.filedescription,
td.filesize,
td.filedate,
td.filetags {
padding: 7px 5px 3px 5px!important;
font-size: .9167em;
}
/* File list */
.filelist {
width: 100%;
}
* html .filelist {
width: 98%;
}
.filelist th {
border-bottom: 1px solid #CCCCCC;
td.filedescription {
padding-top: 5px;
}
/* File list */
.filelist table th {
border-bottom: 0;
}
.filelist td.right input.btn-big-del {
font-size: 1%;
}
.filelist td.right input.btn-big-edit {
font-size: 1%;
}
.filelist .filethumb img {
width: 20px;
}
@media screen and (-webkit-min-device-pixel-ratio:0){
.filelist td.right input {
display: inline;
}
}
/* parent folder row */
tr.parentfolder td {
background-color: #ddd !important;
font-style: italic;
}
tr.parentfolder td.filename a.changefolder {
height: 16px;
display: block;
background: url(../images/parentfolder.png) no-repeat left top;
}
/* new row */
.filelist tr.highlight-file td {
background-color: #fffcd8 !important;
border-bottom: 1px solid #FFF;
}
/* folder row */
tr.folder td {
border-bottom: 1px solid #FFF;
}
tr.folder td.filename {
font-weight: bold;
}
/* folder row being moved */
tr.folderhover td {
background-color: #ffc;
tr.editrow table td {
border: 0;
background: none;
}
tr.folderhover a, .foldernav a.folderhover {
text-decoration: none;
text-decoration: none;
}
.icon-drag {
width: 1.5em;
......@@ -194,33 +85,37 @@ tr.folderhover a, .foldernav a.folderhover {
#files_filebrowser_edit_row td td {
border: none;
}
.fileedittable tbody th {
padding-top: 8px;
}
/* Edit post File list */
#editpost_filebrowser_upload_container {
margin-top: 10px;
}
#editpost_filebrowser_upload_browse,
#editpost_filebrowser_open_upload_browse_container {
padding: 10px;
border-top: 1px solid #eee;
border-right: 1px solid #eee;
border-bottom: 4px solid #eee;
border-left: 1px solid #eee;
}
.attachments th {
text-align: left !important;
}
/* Edit post selected file list */
#editpost_filebrowser_empty_selectlist {
margin: 0;
}
.filelist table table.editpermissions th,
.filelist table table.editpermissions td {
.filelist table table.editpermissions th, .filelist table table.editpermissions td {
font-size: .9167em;
}
.filelist .disabled {
color: #C3C3C3;
#editpost_filebrowser_selectlist input.unselect {
float: right;
}
input#upload_submit {
font-weight: bold;
}
#editpost_filebrowser_upload_browse,
#editpost_filebrowser_open_upload_browse_container {
padding: 5px;
}
#instconf_folder_selectlist input.button {
font-size: 0.9167em;
float: right;
}
#instconf_artefactid_selectlist input.button {
float: right;
}
\ No newline at end of file
/**
* CSS rules for the file artefact plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* folder row */
tr.folder td {
background-color: #e99adb;
}
\ No newline at end of file
Supports Markdown
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