Skip to content

Commit

Permalink
Moved search down, moved file mgt buttons inot header of workspace pa…
Browse files Browse the repository at this point in the history 
…nel.
  • Loading branch information
@juliantenney
juliantenney committed Jul 17, 2015
1 parent d7c00ec commit c37158e
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 45 deletions.
80 changes: 42 additions & 38 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,29 +179,7 @@

<div class="buttonbar">
<div class="file_mgt_area_top">
<div class="file_mgt_area_buttons">
<div class="file_mgt_area_middle_button_left">
<button type="button" class="xerte_button_c_no_width" id="newfolder" onclick="javascript:make_new_folder()">
<i class="fa fa-lg fa-folder xerte-icon"></i><?php echo INDEX_BUTTON_NEWFOLDER; ?>
</button>
</div>
<div class="file_mgt_area_middle_button_left">
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="properties"><?php echo INDEX_BUTTON_PROPERTIES; ?></button>
<button type="button" class="xerte_button_c_nowidth_disabled" disabled="disabled"
id="edit"><?php echo INDEX_BUTTON_EDIT; ?></button>
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="preview"><?php echo INDEX_BUTTON_PREVIEW; ?></button>
</div>
<div class="file_mgt_area_middle_button_right">
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="delete"><?php echo INDEX_BUTTON_DELETE; ?></button>
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="duplicate"><?php echo INDEX_BUTTON_DUPLICATE; ?></button>
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="publish"><?php echo INDEX_BUTTON_PUBLISH; ?></button>
</div>
</div>


</div>

Expand Down Expand Up @@ -229,27 +207,53 @@

<div class="ui-layout-west" id="workspace_layout">
<div class="header" id="inner_left_header">
<div class="workspace_search_outer">
<div class="workspace_search">
<input type="text" id="workspace_search">
</div>
</div>
<div class="file_mgt_area_buttons">
<div class="file_mgt_area_middle_button_left">
<button type="button" class="xerte_button_c_no_width" id="newfolder" onclick="javascript:make_new_folder()">
<i class="fa fa-lg fa-folder xerte-icon"></i><?php echo INDEX_BUTTON_NEWFOLDER; ?>
</button>
</div>
<div class="file_mgt_area_middle_button_left">
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="properties"><?php echo INDEX_BUTTON_PROPERTIES; ?></button>
<button type="button" class="xerte_button_c_nowidth_disabled" disabled="disabled"
id="edit"><?php echo INDEX_BUTTON_EDIT; ?></button>
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="preview"><?php echo INDEX_BUTTON_PREVIEW; ?></button>
</div>
<div class="file_mgt_area_middle_button_right">
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="delete"><?php echo INDEX_BUTTON_DELETE; ?></button>
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="duplicate"><?php echo INDEX_BUTTON_DUPLICATE; ?></button>
<button type="button" class="xerte_button_c_no_width_disabled" disabled="disabled"
id="publish"><?php echo INDEX_BUTTON_PUBLISH; ?></button>
</div>
</div>
</div>
<div class="content">
<div id="workspace"></div>
</div>
<div class="footer" id="sortContainer">
<div class="file_mgt_area_bottom">
<form name="sorting" style="float:left;margin:7px 5px 5px 10px;">
<?PHP echo INDEX_SORT; ?>
<select id="sort-selector" name="type" onchange="refresh_workspace()">>
<option value="alpha_up"><?PHP echo INDEX_SORT_A; ?></option>
<option value="alpha_down"><?PHP echo INDEX_SORT_Z; ?></option>
<option value="date_down" selected><?PHP echo INDEX_SORT_NEW; ?></option>
<option value="date_up"><?PHP echo INDEX_SORT_OLD; ?></option>
</select>
</form>
</div>
<div class="sorter">
<form name="sorting" style="float:left;margin:7px 5px 5px 10px;">
<?PHP echo INDEX_SORT; ?>
<select id="sort-selector" name="type" onchange="refresh_workspace()">>
<option value="alpha_up"><?PHP echo INDEX_SORT_A; ?></option>
<option value="alpha_down"><?PHP echo INDEX_SORT_Z; ?></option>
<option value="date_down" selected><?PHP echo INDEX_SORT_NEW; ?></option>
<option value="date_up"><?PHP echo INDEX_SORT_OLD; ?></option>
</select>
</form>
</div>
<div class="workspace_search_outer">
<div class="workspace_search">
<?PHP echo INDEX_SEARCH; ?>
<input type="text" id="workspace_search" label="Search">
</div>
</div>
</div>
</div>
</div>

Expand Down
2 changes: 2 additions & 0 deletions languages/en-GB/index.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ define("INDEX_DETAILS","Project Details");

define("INDEX_SORT","Sort Projects");

define("INDEX_SEARCH","Search");

define("INDEX_SORT_A","Alphabetical A-Z");

define("INDEX_SORT_Z","Alphabetical Z-A");
Expand Down
16 changes: 9 additions & 7 deletions website_code/styles/frontpage.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,8 @@ body{

.file_mgt_area_buttons{
height:25px;
margin-left: 20px;
margin-left: 12px;
margin-top:6px;
}

.file_mgt_area_middle_button_left{
Expand Down Expand Up @@ -638,21 +639,22 @@ div#folder_workspace, div#recyclebin{

.workspace_search_outer
{
margin:3px 10px 3px 10px;
width:92%;
float:left;
margin:5px 5px 5px 40px;
padding-right:10px;

}

.workspace_search
{
margin:3px 10px 3px 10px;
background-color: #fff;
width:100%;
}

.workspace_search input{
padding: 3px;
background: url(../images/Search_Icon_Light_Grey_16.png) no-repeat;
background-position: right;
padding: 2px;
//background: url(../images/Search_Icon_Light_Grey_16.png) no-repeat;
//background-position: right;
width: 100%;
}

Expand Down

0 comments on commit c37158e

Please sign in to comment.