update btn documents

1.10.x
aragonc 10 years ago
parent 2964727aad
commit 243a617eb1
  1. 13
      main/css/base.css
  2. 22
      main/document/create_document.php
  3. 8
      main/document/document.php
  4. 3
      main/document/showinframes.php
  5. 2
      main/inc/lib/document.lib.php
  6. 8
      main/inc/lib/sortable_table.class.php

@ -460,6 +460,7 @@ footer {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
box-shadow: 0 1px 1px rgba(0,0,0,0.05);
margin-bottom: 20px;
}
[dir=rtl] .actions {
background:#efefef;
@ -469,7 +470,6 @@ footer {
vertical-align:middle;
float: right;
}
.actions .actions-pagination {
float:right;
margin-top:2px;
@ -487,26 +487,19 @@ footer {
.actions form {
margin-bottom: 0px;
}
.actions fieldset {
margin-top:0px;
}
.muted {
color: #999999 !important;
color: #999999 !important;
}
.actions a {
display: inline-block;
margin-right: 10px;
}
.actions .btn-toolbar {
margin : 0px;
}
.actions span {
display: inline-block;
margin-right: 10px;
@ -516,11 +509,9 @@ footer {
margin-right: 10px;
vertical-align:middle;
}
.actions fieldset {
margin-top:0px;
}
#friend-container .thumbnail {
min-height: 140px;
}

@ -19,8 +19,8 @@ $htmlHeadXtra[] = '
var hide_bar = function() {
$("#template_col").hide();
$("#doc_form").removeClass("span9");
$("#doc_form").addClass("span11");
$("#doc_form").removeClass("col-md-9");
$("#doc_form").addClass("col-md-11");
$("#hide_bar_template").css({"background-image" : \'url("../img/hide2.png")\'})
}
@ -34,8 +34,8 @@ $(document).ready(function() {
},
function() {
$("#template_col").show();
$("#doc_form").removeClass("span11");
$("#doc_form").addClass("span9");
$("#doc_form").removeClass("col-md-11");
$("#doc_form").addClass("col-md-9");
$(this).css("background-image", \'url("../img/hide0.png")\');
}
);
@ -279,9 +279,9 @@ function document_exists($filename) {
// Add group to the form
if ($is_certificate_mode) {
$form->addElement('text', 'title', get_lang('CertificateName'), 'class="span4" id="document_title"');
$form->addElement('text', 'title', get_lang('CertificateName'), 'class="form-control" id="document_title"');
} else {
$form->addElement('text', 'title', get_lang('Title'), 'class="span4" id="document_title"');
$form->addElement('text', 'title', get_lang('Title'), 'class="form-control" id="document_title"');
}
// Show read-only box only in groups
@ -396,9 +396,9 @@ if (!$is_certificate_mode && !DocumentManager::is_my_shared_folder($userId, $dir
}
if ($is_certificate_mode)
$form->addElement('style_submit_button', 'submit', get_lang('CreateCertificate'), 'class="save"');
$form->addElement('style_submit_button', 'submit', get_lang('CreateCertificate'), 'class="btn-default"');
else
$form->addElement('style_submit_button', 'submit', get_lang('CreateDoc'), 'class="save"');
$form->addElement('style_submit_button', 'submit','<i class="fa fa-file-text"></i> '. get_lang('CreateDoc'), 'class="btn-primary"');
$form->setDefaults($defaults);
@ -587,12 +587,12 @@ if ($form->validate()) {
Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
}
// HTML-editor
echo '<div class="row-fluid" style="overflow:hidden">
<div id="template_col" class="span3" style="width:200px">
echo '<div class="row" style="overflow:hidden">
<div id="template_col" class="col-md-3" style="width:200px">
<div id="frmModel" ></div>
</div>
<div id="hide_bar_template"></div>
<div id="doc_form" class="span9">
<div id="doc_form" class="col-md-9">
'.$form->return_form().'
</div>
</div>';

@ -381,12 +381,12 @@ switch ($action) {
if (file_exists($copyfile)) {
$message = get_lang('CopyAlreadyDone').'</p><p>';
$message .= '<a class = "btn" '.
$message .= '<a class = "btn btn-default" '.
'href="'.api_get_self().'?'.api_get_cidreq().'&amp;id='.$parent_id.'">'.
get_lang("No").
'</a>'.
'&nbsp;&nbsp;|&nbsp;&nbsp;'.
'<a class = "btn" href="'.api_get_self().'?'.
'<a class = "btn btn-default" href="'.api_get_self().'?'.
api_get_cidreq().'&amp;action=copytomyfiles&amp;id='.$document_info['id'].
'&amp;copy=yes">'.
get_lang('Yes').
@ -1368,7 +1368,7 @@ if ($is_allowed_to_edit ||
$templateForm .= '<tr><td>'.get_lang('TemplateImage').' : </td>';
$templateForm .= '<td><input type="file" name="template_image" id="template_image" /></td></tr>';
$templateForm .= '</table>';
$templateForm .= '<button type="submit" class="add" name="create_template">'.get_lang('CreateTemplate').'</button>';
$templateForm .= '<button type="submit" class="btn-default" name="create_template">'.get_lang('CreateTemplate').'</button>';
$templateForm .= '</form>';
} elseif (isset($_GET['add_as_template']) && isset($_POST['create_template'])) {
@ -1513,7 +1513,7 @@ if (!$is_certificate_mode) {
$form = new FormValidator('search_document', 'get', api_get_self().'?'.api_get_cidreq());
$renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$form->addText('keyword', '', false, array('class' => 'span2'));
$form->addText('keyword', '', false, array('class' => 'col-md-2'));
$form->addElement('hidden', 'cidReq', api_get_course_id());
$form->addElement('hidden', 'id_session', api_get_session_id());
$form->addElement('hidden', 'gidReq', $groupId);

@ -348,7 +348,8 @@ if ($show_web_odf) {
echo '</div>';
} else {
// ViewerJS already have download button
echo '<a class="btn" href="'.$file_url_web.'" target="_blank">'.get_lang('Download').'</a>';
echo '<a class="btn btn-default" href="'.$file_url_web.'" target="_blank"><i class="fa fa-download"></i>
'.get_lang('Download').'</a>';
}
echo '</div>';

@ -5775,7 +5775,7 @@ class DocumentManager
$form->addElement('hidden', 'id', intval($dirId));
$form->addElement('header', '', get_lang('CreateDir'));
$form->addElement('text', 'dirname', get_lang('NewDir'), array('autofocus' => 'autofocus'));
$form->addElement('style_submit_button', 'submit', get_lang('CreateFolder'), 'class="add"');
$form->addElement('style_submit_button', 'submit','<i class="fa fa-folder-open"></i> '. get_lang('CreateFolder'), 'class="btn-primary"');
$new_folder_text = $form->return_form();
return $new_folder_text;
}

@ -297,12 +297,12 @@ class SortableTable extends HTML_Table
if (count($this->form_actions) > 0) {
$html .= '<div class="btn-toolbar">';
$html .= '<div class="btn-group">';
$html .= '<a class="btn" href="?'.$params.'&amp;'.$this->param_prefix.'selectall=1" onclick="javascript: setCheckbox(true, \''.$table_id.'\'); return false;">'.get_lang('SelectAll').'</a>';
$html .= '<a class="btn" href="?'.$params.'" onclick="javascript: setCheckbox(false, \''.$table_id.'\'); return false;">'.get_lang('UnSelectAll').'</a> ';
$html .= '<a class="btn btn-default" href="?'.$params.'&amp;'.$this->param_prefix.'selectall=1" onclick="javascript: setCheckbox(true, \''.$table_id.'\'); return false;">'.get_lang('SelectAll').'</a>';
$html .= '<a class="btn btn-default" href="?'.$params.'" onclick="javascript: setCheckbox(false, \''.$table_id.'\'); return false;">'.get_lang('UnSelectAll').'</a> ';
$html .= '</div>';
$html .= '<div class="btn-group">
<button class="btn" onclick="javascript:return false;">'.get_lang('Actions').'</button>
<button class="btn dropdown-toggle" data-toggle="dropdown">
<button class="btn btn-default" onclick="javascript:return false;">'.get_lang('Actions').'</button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>';
$html .= '<ul class="dropdown-menu">';

Loading…
Cancel
Save