fnp
/
fnpeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ab6c871
)
wlxml/editor: rename class uri to link
author
Aleksander Łukasz
<aleksander.lukasz@nowoczesnapolska.org.pl>
Thu, 19 Dec 2013 11:49:26 +0000
(12:49 +0100)
committer
Aleksander Łukasz
<aleksander.lukasz@nowoczesnapolska.org.pl>
Thu, 19 Dec 2013 11:49:26 +0000
(12:49 +0100)
src/editor/modules/documentCanvas/nodes.less
patch
|
blob
|
history
src/editor/modules/documentToolbar/template.html
patch
|
blob
|
history
src/editor/modules/nodePane/template.html
patch
|
blob
|
history
src/wlxml/wlxml.js
patch
|
blob
|
history
diff --git
a/src/editor/modules/documentCanvas/nodes.less
b/src/editor/modules/documentCanvas/nodes.less
index
35c7ece
..
f41363b
100644
(file)
--- a/
src/editor/modules/documentCanvas/nodes.less
+++ b/
src/editor/modules/documentCanvas/nodes.less
@@
-63,7
+63,7
@@
padding: 10px;
}
padding: 10px;
}
-[wlxml-class|="
uri
"] {
+[wlxml-class|="
link
"] {
color: blue;
text-decoration: underline;
}
color: blue;
text-decoration: underline;
}
diff --git
a/src/editor/modules/documentToolbar/template.html
b/src/editor/modules/documentToolbar/template.html
index
f91e1e8
..
f0a3682
100644
(file)
--- a/
src/editor/modules/documentToolbar/template.html
+++ b/
src/editor/modules/documentToolbar/template.html
@@
-3,7
+3,7
@@
<button data-name="new-node" data-meta="header/" data-btn-type="cmd" class="btn btn-mini">nagłówek</button>
<button data-name="new-node" data-meta="div/p" data-btn-type="cmd" class="btn btn-mini">paragraf</button>
<button data-name="new-node" data-meta="span/cite" data-btn-type="cmd" class="btn btn-mini">cytat</i></button>
<button data-name="new-node" data-meta="header/" data-btn-type="cmd" class="btn btn-mini">nagłówek</button>
<button data-name="new-node" data-meta="div/p" data-btn-type="cmd" class="btn btn-mini">paragraf</button>
<button data-name="new-node" data-meta="span/cite" data-btn-type="cmd" class="btn btn-mini">cytat</i></button>
- <button data-name="new-node" data-meta="span/
uri" data-btn-type="cmd" class="btn btn-mini">uri
</i></button>
+ <button data-name="new-node" data-meta="span/
link" data-btn-type="cmd" class="btn btn-mini">link
</i></button>
<select class="rng-module-documentToolbar-toolbarOption" data-option="newTag-tag">
<% var options = ['', 'section', 'header', 'div', 'span', 'aside']; %>
<% options.forEach(function(option) { %>
<select class="rng-module-documentToolbar-toolbarOption" data-option="newTag-tag">
<% var options = ['', 'section', 'header', 'div', 'span', 'aside']; %>
<% options.forEach(function(option) { %>
@@
-11,7
+11,7
@@
<% }); %>
</select>
<select class="rng-module-documentToolbar-toolbarOption" data-option="newTag-class">
<% }); %>
</select>
<select class="rng-module-documentToolbar-toolbarOption" data-option="newTag-class">
- <% var options = ['', 'author', 'title', 'cite', 'cite.code', 'cite.code.xml', 'list.items', 'item', '
uri
', 'p', 'footnote', 'todo', 'emp'] %>
+ <% var options = ['', 'author', 'title', 'cite', 'cite.code', 'cite.code.xml', 'list.items', 'item', '
link
', 'p', 'footnote', 'todo', 'emp'] %>
<% options.forEach(function(option) { %>
<option value="<%= option.replace(/\./g, '-') %>" <% if(option==='cite') { %>selected<% } %>><%= wlxmlUtils.getClassLabel(option) %></option>
<% }); %>
<% options.forEach(function(option) { %>
<option value="<%= option.replace(/\./g, '-') %>" <% if(option==='cite') { %>selected<% } %>><%= wlxmlUtils.getClassLabel(option) %></option>
<% }); %>
diff --git
a/src/editor/modules/nodePane/template.html
b/src/editor/modules/nodePane/template.html
index
55a3cc2
..
40db3ea
100644
(file)
--- a/
src/editor/modules/nodePane/template.html
+++ b/
src/editor/modules/nodePane/template.html
@@
-13,7
+13,7
@@
<div>
<label>Klasa</label>
<select class="rng-module-nodePane-classSelect">
<div>
<label>Klasa</label>
<select class="rng-module-nodePane-classSelect">
- <% var options = ['', 'author', 'title', 'comment', 'cite', 'cite.code', 'cite.code.xml', 'list.items', 'list.items.enum', 'item', '
uri
', 'p', 'footnote', 'todo', 'emp'] %>
+ <% var options = ['', 'author', 'title', 'comment', 'cite', 'cite.code', 'cite.code.xml', 'list.items', 'list.items.enum', 'item', '
link
', 'p', 'footnote', 'todo', 'emp'] %>
<% options.forEach(function(option) { %>
<option value="<%= option.replace(/\./g, '-') %>" <% if(option === '') { %>selected<% } %>><%= utils.getClassLabel(option) %></option>
<% }); %>
<% options.forEach(function(option) { %>
<option value="<%= option.replace(/\./g, '-') %>" <% if(option === '') { %>selected<% } %>><%= utils.getClassLabel(option) %></option>
<% }); %>
diff --git
a/src/wlxml/wlxml.js
b/src/wlxml/wlxml.js
index
7f6e931
..
820b95f
100644
(file)
--- a/
src/wlxml/wlxml.js
+++ b/
src/wlxml/wlxml.js
@@
-286,8
+286,8
@@
$.extend(WLXMLDocument.prototype, {
});
var wlxmlClasses = {
});
var wlxmlClasses = {
- '
uri
': {
- attrs: {
uri
: {type: 'string'}}
+ '
link
': {
+ attrs: {
href
: {type: 'string'}}
}
};
}
};