Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/dev/_bundle/default.json b/dev/_bundle/default.json
- index 60aab23..e819ec5 100644
- --- a/dev/_bundle/default.json
- +++ b/dev/_bundle/default.json
- @@ -256,6 +256,7 @@
- "LINK_TO_THE_PAPER": "Link to the paper",
- "LIST_VIEW": "List view",
- "locale": "default",
- +"LOADING_ELLIPSIS": "Loading ...",
- "LOADING_PLEASE_HOLD_ON": "Loading, please hold on",
- "LOCATION": "Location",
- "LOCATIONS": "Locations",
- diff --git a/dev/_javascript/people.js b/dev/_javascript/people.js
- index 458d24e..5b5e9ec 100644
- --- a/dev/_javascript/people.js
- +++ b/dev/_javascript/people.js
- @@ -37,13 +37,15 @@ sakai.search = function(){
- loadContacts(currentpage);
- };
- + var errorText = $("#AN_ERROR_HAS_OCCURRED");
- +
- loadContacts = function(page){
- currentpage = parseInt(page, 10);
- // Set searching messages
- - $("#contacts_search_result").html("<b>Loading ...</b>");
- + $("#contacts_search_result").html($.TemplateRenderer($("#loading_template")));
- $.ajax({
- url: "/var/contacts/accepted.infinity.json?page=" + (page - 1) + "&items=" + peopleToSearch,
- @@ -53,7 +55,7 @@ sakai.search = function(){
- renderContacts();
- },
- error: function(xhr, textStatus, thrownError) {
- - $("#contacts_search_result").html("<b>An error has occurred.</b> Please try again later");
- + $("#contacts_search_result").html($.TemplateRenderer($("#error_template")));
- }
- });
- @@ -141,7 +143,7 @@ sakai.search = function(){
- },
- error: function(xhr, textStatus, thrownError) {
- - alert("An error has occured");
- + alert(errorText);
- }
- });
- @@ -156,7 +158,7 @@ sakai.search = function(){
- // Set searching messages
- - $("#invited_search_result").html("<b>Loading ...</b>");
- + $("#invited_search_result").html($.TemplateRenderer($("#loading_template")));
- $.ajax({
- url: "/var/contacts/invited.infinity.json?page=0&items=100",
- @@ -166,7 +168,7 @@ sakai.search = function(){
- renderInvitations();
- },
- error: function(xhr, textStatus, thrownError) {
- - $("#invited_search_result").html("<b>An error has occurred.</b> Please try again later");
- + $("#invited_search_result").html($.TemplateRenderer($("#error_template")));
- }
- });
- @@ -243,7 +245,7 @@ sakai.search = function(){
- },
- error: function(xhr, textStatus, thrownError) {
- - alert("An error has occured");
- + alert(errorText);
- }
- });
- @@ -260,7 +262,7 @@ sakai.search = function(){
- // Set searching messages
- - $("#invited_search_result").html("<b>Loading ...</b>");
- + $("#invited_search_result").html($.TemplateRenderer($("#loading_template")));
- $.ajax({
- url: "/var/contacts/pending.infinity.json?page=0&items=100",
- @@ -270,7 +272,7 @@ sakai.search = function(){
- renderPending();
- },
- error: function(xhr, textStatus, thrownError) {
- - $("#pending_search_result").html("<b>An error has occurred.</b> Please try again later");
- + $("#pending_search_result").html($.TemplateRenderer($("#error_template")));
- }
- });
- diff --git a/dev/my_sakai.html b/dev/my_sakai.html
- index c949a52..b0e747d 100644
- --- a/dev/my_sakai.html
- +++ b/dev/my_sakai.html
- @@ -73,7 +73,7 @@
- <button class="s3d-button s3d-button-inline" id="mysakai_more_link">
- <span class="s3d-button-inner">
- <span class="s3d-button-icon-left"></span>
- - <span class="s3d-button-inner-text">Edit Page</span>
- + <span class="s3d-button-inner-text">__MSG__EDIT_PAGE__</span>
- <span class="s3d-button-icon-right"></span>
- </span>
- </button>
- @@ -115,4 +115,4 @@
- </body>
- -</html>
- \ No newline at end of file
- +</html>
- diff --git a/dev/people.html b/dev/people.html
- index ebdf7e1..831670f 100644
- --- a/dev/people.html
- +++ b/dev/people.html
- @@ -221,6 +221,14 @@
- </div>
- </div>
- + <div id="loading_template" style="display:none"><!--
- + <b>__MSG__LOADING_ELLIPSIS__</b>
- + --></div>
- +
- + <div id="error_template" style="display:none"><!--
- + <b>__MSG__AN_ERROR_HAS_OCCURRED__</b> __MSG__PLEASE_TRY_AGAIN_LATER__
- + --></div>
- +
- <!-- FOOTER WIDGET -->
- <div id="widget_footer" class="widget_inline footercontainer"></div>
- @@ -231,6 +239,9 @@
- <div id="widget_sendmessage" class="widget_inline" style="width:100%"></div>
- </div>
- + <!-- I18N Strings for use in js -->
- + <span id="AN_ERROR_HAS_OCCURRED" style="display:none">__MSG__AN_ERROR_HAS_OCCURRED__</span>
- +
- <script type="text/javascript" src="_javascript/people.js"></script>
- </body>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement