Advertisement
Guest User

Untitled

a guest
Jun 23rd, 2017
51
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.24 KB | None | 0 0
  1.  
  2. diff --git a/dev/_bundle/default.json b/dev/_bundle/default.json
  3. index 60aab23..e819ec5 100644
  4. --- a/dev/_bundle/default.json
  5. +++ b/dev/_bundle/default.json
  6. @@ -256,6 +256,7 @@
  7.  "LINK_TO_THE_PAPER": "Link to the paper",
  8.  "LIST_VIEW": "List view",
  9.  "locale": "default",
  10. +"LOADING_ELLIPSIS": "Loading ...",
  11.  "LOADING_PLEASE_HOLD_ON": "Loading, please hold on",
  12.  "LOCATION": "Location",
  13.  "LOCATIONS": "Locations",
  14. diff --git a/dev/_javascript/people.js b/dev/_javascript/people.js
  15. index 458d24e..5b5e9ec 100644
  16. --- a/dev/_javascript/people.js
  17. +++ b/dev/_javascript/people.js
  18. @@ -37,13 +37,15 @@ sakai.search = function(){
  19.          loadContacts(currentpage);
  20.      };
  21.  
  22. +    var errorText = $("#AN_ERROR_HAS_OCCURRED");
  23. +
  24.      loadContacts = function(page){
  25.  
  26.          currentpage = parseInt(page, 10);
  27.  
  28.          // Set searching messages
  29.  
  30. -        $("#contacts_search_result").html("<b>Loading ...</b>");
  31. +        $("#contacts_search_result").html($.TemplateRenderer($("#loading_template")));
  32.  
  33.          $.ajax({
  34.              url: "/var/contacts/accepted.infinity.json?page=" + (page - 1) + "&items=" + peopleToSearch,
  35. @@ -53,7 +55,7 @@ sakai.search = function(){
  36.                  renderContacts();
  37.              },
  38.              error: function(xhr, textStatus, thrownError) {
  39. -                $("#contacts_search_result").html("<b>An error has occurred.</b> Please try again later");
  40. +                $("#contacts_search_result").html($.TemplateRenderer($("#error_template")));
  41.              }
  42.          });
  43.  
  44. @@ -141,7 +143,7 @@ sakai.search = function(){
  45.  
  46.                  },
  47.                  error: function(xhr, textStatus, thrownError) {
  48. -                    alert("An error has occured");
  49. +                    alert(errorText);
  50.                  }
  51.              });
  52.  
  53. @@ -156,7 +158,7 @@ sakai.search = function(){
  54.  
  55.          // Set searching messages
  56.  
  57. -        $("#invited_search_result").html("<b>Loading ...</b>");
  58. +        $("#invited_search_result").html($.TemplateRenderer($("#loading_template")));
  59.  
  60.          $.ajax({
  61.              url: "/var/contacts/invited.infinity.json?page=0&items=100",
  62. @@ -166,7 +168,7 @@ sakai.search = function(){
  63.                  renderInvitations();
  64.              },
  65.              error: function(xhr, textStatus, thrownError) {
  66. -                $("#invited_search_result").html("<b>An error has occurred.</b> Please try again later");
  67. +                $("#invited_search_result").html($.TemplateRenderer($("#error_template")));
  68.              }
  69.          });
  70.  
  71. @@ -243,7 +245,7 @@ sakai.search = function(){
  72.  
  73.                  },
  74.                  error: function(xhr, textStatus, thrownError) {
  75. -                    alert("An error has occured");
  76. +                    alert(errorText);
  77.                  }
  78.              });
  79.  
  80. @@ -260,7 +262,7 @@ sakai.search = function(){
  81.  
  82.          // Set searching messages
  83.  
  84. -        $("#invited_search_result").html("<b>Loading ...</b>");
  85. +        $("#invited_search_result").html($.TemplateRenderer($("#loading_template")));
  86.  
  87.          $.ajax({
  88.              url: "/var/contacts/pending.infinity.json?page=0&items=100",
  89. @@ -270,7 +272,7 @@ sakai.search = function(){
  90.                  renderPending();
  91.              },
  92.              error: function(xhr, textStatus, thrownError) {
  93. -                $("#pending_search_result").html("<b>An error has occurred.</b> Please try again later");
  94. +                $("#pending_search_result").html($.TemplateRenderer($("#error_template")));
  95.              }
  96.          });
  97.  
  98. diff --git a/dev/my_sakai.html b/dev/my_sakai.html
  99. index c949a52..b0e747d 100644
  100. --- a/dev/my_sakai.html
  101. +++ b/dev/my_sakai.html
  102. @@ -73,7 +73,7 @@
  103.                          <button class="s3d-button s3d-button-inline" id="mysakai_more_link">
  104.                              <span class="s3d-button-inner">
  105.                                  <span class="s3d-button-icon-left"></span>
  106. -                                <span class="s3d-button-inner-text">Edit Page</span>
  107. +                                <span class="s3d-button-inner-text">__MSG__EDIT_PAGE__</span>
  108.                                  <span class="s3d-button-icon-right"></span>
  109.                              </span>
  110.                          </button>
  111. @@ -115,4 +115,4 @@
  112.  
  113.      </body>
  114.  
  115. -</html>
  116. \ No newline at end of file
  117. +</html>
  118. diff --git a/dev/people.html b/dev/people.html
  119. index ebdf7e1..831670f 100644
  120. --- a/dev/people.html
  121. +++ b/dev/people.html
  122. @@ -221,6 +221,14 @@
  123.              </div>
  124.          </div>
  125.  
  126. +        <div id="loading_template" style="display:none"><!--
  127. +            <b>__MSG__LOADING_ELLIPSIS__</b>
  128. +        --></div>
  129. +
  130. +        <div id="error_template" style="display:none"><!--
  131. +            <b>__MSG__AN_ERROR_HAS_OCCURRED__</b> __MSG__PLEASE_TRY_AGAIN_LATER__
  132. +        --></div>
  133. +
  134.          <!-- FOOTER WIDGET -->
  135.          <div id="widget_footer" class="widget_inline footercontainer"></div>
  136.  
  137. @@ -231,6 +239,9 @@
  138.              <div id="widget_sendmessage" class="widget_inline" style="width:100%"></div>
  139.          </div>
  140.  
  141. +        <!-- I18N Strings for use in js -->
  142. +        <span id="AN_ERROR_HAS_OCCURRED" style="display:none">__MSG__AN_ERROR_HAS_OCCURRED__</span>
  143. +
  144.          <script type="text/javascript" src="_javascript/people.js"></script>
  145.  
  146.      </body>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement