zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

focus on input when show add column window and tags bug fixed

Browse Source
1.0
Javier Alvarez 13 years ago
parent 60df7cf072
commit feaf9b4d0c
17 changed files with 395 additions and 49 deletions
Show Stats Download Patch File Download Diff File

1
.idea/.name
Unescape View File

@ -0,0 +1 @@
cartodb

9
.idea/cartodb.iml
Unescape View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

5
.idea/encodings.xml
Unescape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
</project>

8
.idea/misc.xml
Unescape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DependencyValidationManager">
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
<component name="ProjectRootManager" version="2" />
</project>

9
.idea/modules.xml
Unescape View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/cartodb.iml" filepath="$PROJECT_DIR$/.idea/cartodb.iml" />
</modules>
</component>
</project>

7
.idea/vcs.xml
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

260
.idea/workspace.xml
Unescape View File

@ -0,0 +1,260 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="cff41f29-b15b-4cd6-b46f-8ef97e944748" name="Default" comment="" />
<ignored path="cartodb.iws" />
<ignored path=".idea/workspace.xml" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
<option name="REVERSE_PATCH" value="false" />
</component>
<component name="DaemonCodeAnalyzer">
<disable_hints />
</component>
<component name="FavoritesManager">
<favorites_list name="cartodb" />
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="_footer.html.erb" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/home/_footer.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="39" selection-start="39" selection-end="39" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html.erb" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/views/home/index.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state line="17" column="11" selection-start="629" selection-end="629" vertical-scroll-proportion="0.28114665">
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings">
<option name="CHECKOUT_INCLUDE_TAGS" value="false" />
<option name="UPDATE_CHANGES_POLICY" value="STASH" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents ProjectPane="false" />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="cartodb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="cartodb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="cartodb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="cartodb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="cartodb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="cartodb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="home" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="cartodb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="cartodb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Favorites" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
</component>
<component name="RunManager">
<list size="0" />
</component>
<component name="ShelveChangesManager" show_recycled="false" />
<component name="SvnConfiguration" maxAnnotateRevisions="500">
<option name="USER" value="" />
<option name="PASSWORD" value="" />
<option name="mySSHConnectionTimeout" value="30000" />
<option name="mySSHReadTimeout" value="30000" />
<option name="LAST_MERGED_REVISION" />
<option name="MERGE_DRY_RUN" value="false" />
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
<option name="DETECT_NESTED_COPIES" value="true" />
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
<option name="FORCE_UPDATE" value="false" />
<myIsUseDefaultProxy>false</myIsUseDefaultProxy>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<created>1314107197859</created>
<updated>1314107197859</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="0" y="22" width="1920" height="1054" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Phing Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14698023" sideWeight="0.996904" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
</layout>
</component>
<component name="VcsManagerConfiguration">
<option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="CHECK_NEW_TODO" value="true" />
<option name="myTodoPanelSettings">
<value>
<are-packages-shown value="false" />
<are-modules-shown value="false" />
<flatten-packages value="false" />
<is-autoscroll-to-source value="false" />
</value>
</option>
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
<option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
<option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
<option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
<option name="DEFAULT_PATCH_EXTENSION" value="patch" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="LAST_COMMIT_MESSAGE" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
<option name="ACTIVE_VCS_NAME" />
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/views/home/_footer.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="39" selection-start="39" selection-end="39" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/home/index.html.erb">
<provider selected="true" editor-type-id="text-editor">
<state line="17" column="11" selection-start="629" selection-end="629" vertical-scroll-proportion="0.28114665">
<folding />
</state>
</provider>
</entry>
</component>
</project>

76
app/views/admin/tables/index.html.erb
Unescape View File

@ -45,45 +45,51 @@
<div class="tables_list">
<div class="left">
<div class="top_blue_medium">
<h3><strong>
<%= pluralize(@tables.pagination_record_count, 'table', 'tables') %>
<% if @tag_name %>
with the tag <%= @tag_name %>
<% end %>
</strong> in your account</h3>
<h3>
<strong>
<%= pluralize(@tables.pagination_record_count, 'table', 'tables') %>
<% if @tag_name %>
with the tag <%= @tag_name %>
<% end %>
</strong> in your account
</h3>
</div>
<div class="middle_white_medium">
<% if @tables.empty? %>
<div class="no_tables">
<h5>Hey! You don't have any tables</h5>
<p>Why don't you start by <a href="#create_table" class="new_table">creating a new table</a>?</p>
</div>
<% else %>
<ul class="your_tables">
<% @tables.each_with_index do |table, i| %>
<li<%= ' class="last"'.html_safe if i == @tables.count - 1%>>
<div class="meta_info">
<span class="info">
<h4><%= link_to(table.name, table_path(table), :class=>'tableTitle') %> </h4>
<p class="status <%= table_privacy_text(table).downcase %>"><%= table_privacy_text(table) %></p>
<p class="delete"> | <a table-name="<%= table.name %>" href="#delete" class="delete">delete table</a></p>
<p class="columns"><strong><%= pluralize(table.rows_counted,'row','rows') rescue '' %> / <%= table.schema.size rescue '' %> columns:</strong>
<%= table.schema.map{ |e| e.first }[1...4].join(', ') %>...</p>
</span>
<span class="tags">
<% unless table.updated_at.blank? %>
<p class="last_op"><%= time_ago_in_words(table.updated_at) %> ago</p>
<% end %>
<% unless table.tags.blank? %>
<% table.tags.split(',').each do |tag_name| %>
<a href="<%= dashboard_path(:tag_name => tag_name) %>"><%= tag_name %></a>
<% end %>
<ul class="your_tables">
<% @tables.each_with_index do |table, i| %>
<li<%= ' class="last"'.html_safe if i == @tables.count - 1%>>
<div class="meta_info">
<span class="info">
<h4><%= link_to(table.name, table_path(table), :class=>'tableTitle') %> </h4>
<p class="status <%= table_privacy_text(table).downcase %>"><%= table_privacy_text(table) %></p>
<p class="delete"> | <a table-name="<%= table.name %>" href="#delete" class="delete">delete table</a></p>
<p class="columns"><strong><%= pluralize(table.rows_counted,'row','rows') rescue '' %> / <%= table.schema.size rescue '' %> columns:</strong>
<%= table.schema.map{ |e| e.first }[1...4].join(', ') %>...</p>
</span>
<span class="tags">
<% unless table.updated_at.blank? %>
<p class="last_op"><%= time_ago_in_words(table.updated_at) %> ago</p>
<% end %>
<% unless table.tags.blank? %>
<% table.tags.split(',').each do |tag_name| %>
<a href="<%= dashboard_path(:tag_name => tag_name) %>"><%= tag_name %></a>
<% end %>
</span>
</div>
</li>
<% end %>
</span>
</div>
</li>
<% end %>
</ul>
<% if @tables.count<3 %>
<div class="no_tables">
<% if @tables.count>0 && @tables.count<3 %>
<h5>Few tables!</h5>
<p>Time to <a href="#create_table" class="new_table">create another table</a>?</p>
<% else %>
<h5>Hey! You don't have any tables</h5>
<p>Why don't you start by <a href="#create_table" class="new_table">creating a new table</a>?</p>
<% end %>
</ul>
</div>
<% end %>
</div>
<div class="bottom_white_medium"></div>

2
config/error_codes.yml
Unescape View File

@ -2,7 +2,7 @@ cartodb_errors:
unknown_error:
code: 0
message: Some error we don't recognize has happen
hint: "We would really apreciate if you send us a detailed e-mail with all the information you can, in order we can fix it as soon as possible"
hint: "We would really apreciate if you <a href='mailto:wadus@cartodb.com'>send us</a> a detailed e-mail with all the information you can, in order we can fix it as soon as possible"
empty_file:
code: 1
message: The file you have tried to upload has no data

24
db/fake_data/dont_work.csv
Unescape View File

@ -0,0 +1,24 @@
,jam,paco,pac,
adsf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf
asdf,asdf,asd,fasd,fasdf,
asdfajsd,
asdfñjk,
asdf
,
,asdf
ññññññññ
1 ,jam,paco,pac,
2 adsf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf,asdf
3 asdf,asdf,asd,fasd,fasdf,
4 asdfajsd,
5 asdfñjk,
6 asdf
7 ,
8 ,asdf
9 ññññññññ

2
public/crossdomain.xml
Unescape View File

@ -2,4 +2,4 @@
<!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">
<cross-domain-policy>
<allow-access-from domain="*" />
</cross-domain-policy>
</cross-domain-policy>

7
public/javascripts/admin/table/carto_table.js
Unescape View File

@ -764,7 +764,7 @@
$(table).parent().append(
'<div class="empty_table">'+
'<h5>Add some rows to your table</h5>'+
'<p>You can <a class="add_row" href="#add_row">add it manually</a> or <a class="disabled">import data</a></p>'+
'<p>You can <a class="add_row" href="#add_row">add it manually</a> or <a class="import_data" href="#import_data">import data</a></p>'+
'</div>'
);
@ -2253,6 +2253,7 @@
$('div.column_window span.select a:eq(0)').text('Retreiving types...').attr('type','');
$('div.column_window a.column_add').addClass('disabled');
$('div.column_window span.select').removeClass('clicked');
$.ajax({
method: "GET",
@ -2286,7 +2287,9 @@
});
$('div.mamufas div.column_window').show();
$('div.mamufas').fadeIn();
$('div.mamufas').fadeIn(function(ev){
$('div.column_window div.options input').focus();
});
}
});
$('div.column_window span.select a.option').livequery('click',function(ev){

20
public/javascripts/admin/table/out_table_elements.js
Unescape View File

@ -210,9 +210,9 @@
'<span class="advanced_options">'+
'<a href="#close_advanced_options" class="advanced">advanced<span></span></a>'+
'<ul>'+
'<li class="disabled"><a class="import_data">Import data...</a></li>'+
'<li><a class="import_data">Import data...</a></li>'+
'<li><a class="export_data">Export data...</a></li>'+
'<li class="disabled"><a class="save_table">Save table as...</a></li>'+ //class="save_table"
'<li><a class="save_table">Save table as...</a></li>'+ //class="save_table"
'</ul>'+
'</span>');
@ -236,10 +236,10 @@
$('a.save_table').click(function(ev){
stopPropagation(ev);
//closeOutTableWindows();
// $('div.mamufas div.save_window').show();
// $('div.mamufas').fadeIn('fast');
// bindESC();
closeOutTableWindows();
$('div.mamufas div.save_window').show();
$('div.mamufas').fadeIn('fast');
bindESC();
});
$('a.table_save').click(function(ev){
@ -653,6 +653,14 @@
$('<p>'+value+'</p>').insertBefore('span.tags a.add');
new_values+=value+',';
});
// Get last input value if it isn't empty
var last_input = $('input.tagit-input').val();
if (last_input.length>0) {
$('<p>'+last_input+'</p>').insertBefore('span.tags a.add');
new_values+=last_input;
}
$("span.tags p:last").last().addClass('last');
$('span.tags_window').hide();

2
public/javascripts/admin/tables/import.js
Unescape View File

@ -82,7 +82,7 @@
},
onCancel: function(id, fileName){},
showMessage: function(message){
$('div.select_file p').text(message);
$('div.select_file p').html(message);
$('div.select_file p').addClass('error');
}
});

8
public/stylesheets/admin/layout.css
Unescape View File

@ -52,9 +52,9 @@ div.mamufas div.create_window a.close_create {position:absolute; right:-8px; top
div.mamufas div.create_window a.close_create:hover {background-position:0 -23px;}
div.mamufas div.create_window a.close_create.last {background-position:0 -46px;}
div.mamufas div.create_window a.close_create.last:hover {background-position:0 -69px;}
div.mamufas div.create_window div.inner_ span.loading {float:left; display:none; opacity:0; width:347px; height:40px; padding:0 0 0 47px; margin:10px; background:url('/images/admin/icons/loading.gif') no-repeat 0 7px;}
div.mamufas div.create_window div.inner_ span.loading {float:left; display:none; opacity:0; width:347px; height:40px; padding:0 0 0 42px; margin:10px; background:url('/images/admin/icons/loading.gif') no-repeat 2px 7px;}
div.mamufas div.create_window div.inner_ span.loading h5 {margin:5px 0 0 0; font:bold 15px "Helvetica"; color:#333333; text-shadow:0 1px white;}
div.mamufas div.create_window div.inner_ span.loading p {padding:6px 0 0 0; font:normal 13px "Helvetica"; color:#666666; text-shadow:0 1px white;}
div.mamufas div.create_window div.inner_ span.loading p {padding:4px 0 0 0; font:normal 13px "Helvetica"; color:#666666; text-shadow:0 1px white;}
div.mamufas div.create_window div.inner_ span.loading p a {color:#666666; text-decoration:underline; cursor:pointer;}
div.mamufas div.create_window div.inner_ span.loading p a:hover {color:#333333;}
div.mamufas div.create_window div.inner_ span.loading.error {background:url('/images/admin/table/stop.png') no-repeat 0 0;}
@ -81,12 +81,14 @@ div.mamufas div.create_window div.inner_ span.top ul li.selected {width:373px!im
div.mamufas div.create_window div.inner_ span.top ul li.selected a {color:white; background-position:0 1px;}
div.mamufas div.create_window div.inner_ span.top ul li.selected a:hover {color:white; cursor:default; background-position:0 1px;}
div.mamufas div.create_window div.inner_ span.top ul li.selected ul.qq-upload-list {display:none;}
div.mamufas div.create_window div.inner_ span.top ul li span.file {display:none;}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file {position:relative; display:block; width:348px; height:28px; margin:10px 10px 0 15px; border:1px solid #000000; background:white; -webkit-border-radius:5px; -moz-border-radius:5px; border-radius:5px;}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.select_file {display:block;}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.progress {display:none;}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file.uploading div.select_file {display:none;}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file.uploading div.progress {display:block;}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.select_file div#uploader {position:relative}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.select_file div#uploader .qq-upload-button{float:left; height:12px; margin:3px 0 0 2px; padding:4px 7px; border:1px solid #999; font:bold 11px "Helvetica",Arial; color:#333333; text-align:center;
text-decoration:none; -webkit-border-radius:3px; -moz-border-radius:3px; border-radius:3px; text-shadow:0 1px white;
background:linear-gradient(-90deg, #FFFFFF, #CACBCE);
@ -102,6 +104,8 @@ div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.s
background: -o-linear-gradient(#CACBCE,#FFFFFF);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#CACBCE', endColorstr='#FFFFFF');
}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.select_file div#uploader .qq-upload-drop-area {position:absolute; z-index:100; top:0; left:0; width:100%; height:28px; border-radius:3px; background:rgba(0,0,0,0.7); font:bold 12px Arial; color:white; text-align:center}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.select_file div#uploader .qq-upload-drop-area span {display:block; padding:8px 0 0 0;}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.select_file p {float:left; margin:1px 0 0 5px; font:normal 13px "Helvetica",Arial; color:#B3B3B3;}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.select_file p.error {color:#FF6600;}
div.mamufas div.create_window div.inner_ span.top ul li.selected span.file div.select_file input {position:absolute; top:0; left:0; width:350px; height:30px; opacity:0;}

2
public/stylesheets/admin/table/out_table_elements.css
Unescape View File

@ -374,6 +374,8 @@ div.mamufas div.import_window div.inner_ span.top ul li.selected {width:373px!im
div.mamufas div.import_window div.inner_ span.top ul li.selected a {color:white; background-position:0 1px;}
div.mamufas div.import_window div.inner_ span.top ul li.selected a:hover {color:white; cursor:default; background-position:0 1px;}
div.mamufas div.import_window div.inner_ span.top ul li.selected ul.qq-upload-list {display:none;}
div.mamufas div.import_window div.inner_ span.top ul li.selected .qq-upload-drop-area {position:absolute; z-index:100; top:0; left:0; width:100%; height:28px; border-radius:3px; background:rgba(0,0,0,0.7); font:bold 12px Arial; color:white; text-align:center}
div.mamufas div.import_window div.inner_ span.top ul li.selected .qq-upload-drop-area span {display:block; padding:8px 0 0 0;}
div.mamufas div.import_window div.inner_ span.top ul li span.file {display:none;}
div.mamufas div.import_window div.inner_ span.top ul li.selected span.file {position:relative; display:block; width:348px; height:28px; margin:10px 10px 0 15px; border:1px solid #000000; background:white; -webkit-border-radius:5px; -moz-border-radius:5px; border-radius:5px;}
div.mamufas div.import_window div.inner_ span.top ul li.selected span.file div.select_file {display:block;}

2
public/stylesheets/admin/tables/dashboard.css
Unescape View File

@ -41,7 +41,7 @@ section#content div.left div.top_blue_medium a.new_table:hover{background:url('/
background:url('/images/front/home/button_border.png') repeat-x 0 -1px,-moz-linear-gradient(-90deg,#67BA6A,#8FD484);background:url('/images/front/home/button_border.png') repeat-x 0 -1px,-o-linear-gradient(#67BA6A,#8FD484);background:url('/images/front/home/button_border.png') repeat-x 0 -1px #67BA6A\9;}
section#content div.left div.middle_white_medium {float:left; width:620px; min-height:500px; padding:0 3px; background:url('/images/admin/backgrounds/middle_white_medium.png') repeat-y 0 0;}
section#content div.left div.middle_white_medium div.no_tables {width:620px; padding:300px 0 151px 0; background:url('/images/admin/public_tables/no_tables.jpg') no-repeat center 100px;}
section#content div.left div.middle_white_medium div.no_tables {float:left; width:620px; padding:300px 0 151px 0; background:url('/images/admin/public_tables/no_tables.jpg') no-repeat center 100px;}
section#content div.left div.middle_white_medium div.no_tables h5 {width:100%; text-align:center; font:bold 21px Arial; color:#A4BBC0; letter-spacing:-1px; word-spacing:2px;}
section#content div.left div.middle_white_medium div.no_tables p {width:100%; padding:4px 0 0 0; text-align:center; font:normal 15px Arial; color:#A4BBC0;}
section#content div.left div.middle_white_medium div.no_tables p a {color:#666666;}

Write Preview
Loading…
Cancel
Save